Remove obsolete bootstrap code

Change-Id: Ifcbf81b5ee04753af916dc1ef1177617785c961d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Fabian Kosmale 2021-09-30 08:35:32 +02:00
parent ba809eae14
commit 466edbf12c
3 changed files with 1 additions and 17 deletions

View File

@ -47,9 +47,7 @@
# include <QtCore/qcommandlineparser.h>
#endif
#ifndef QT_BOOTSTRAPPED
# include <QtCore/qlibraryinfo.h>
#endif
#include <QtCore/qlibraryinfo.h>
using namespace QQmlJS::Dom;
namespace tt {
@ -200,11 +198,7 @@ int main(int argc, char *argv[])
// use host qml import path as a sane default if nothing else has been provided
QStringList qmltypeDirs = parser.isSet(qmltypesDirsOption)
? parser.values(qmltypesDirsOption)
# ifndef QT_BOOTSTRAPPED
: QStringList { QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath) };
# else
: QStringList {};
# endif
if (!parser.isSet(qmltypesFilesOption))
qmltypeDirs << ".";

View File

@ -77,11 +77,7 @@ inline QString linkTargetLiteral()
void printUsage(const QString &appNameIn)
{
const std::wstring appName = appNameIn.toStdWString();
#ifndef QT_BOOTSTRAPPED
const QString qmlPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath);
#else
const QString qmlPath = QStringLiteral("/home/user/dev/qt-install/qml");
#endif
std::wcerr
<< "Usage: " << appName << " -rootPath path/to/app/qml/directory -importPath path/to/qt/qml/directory\n"
" " << appName << " -qmlFiles file1 file2 -importPath path/to/qt/qml/directory\n"

View File

@ -54,9 +54,7 @@
#include <QtCore/qcommandlineparser.h>
#endif
#ifndef QT_BOOTSTRAPPED
#include <QtCore/qlibraryinfo.h>
#endif
#include <cstdio>
@ -349,11 +347,7 @@ All warnings can be set to three levels:
// use host qml import path as a sane default if not explicitly disabled
QStringList qmlImportPaths = parser.isSet(qmlImportNoDefault)
? QStringList {}
# ifndef QT_BOOTSTRAPPED
: QStringList { QLibraryInfo::path(QLibraryInfo::QmlImportsPath), QDir::currentPath() };
# else
: QStringList { QDir::currentPath() };
# endif
if (parser.isSet(qmlImportPathsOption))
qmlImportPaths << parser.values(qmlImportPathsOption);