diff options
-rw-r--r-- | tools/qmlcachegen/qmlcachegen.cpp | 5 | ||||
-rw-r--r-- | tools/qmltc/main.cpp | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp index fccc107c7a..e5af2f8bae 100644 --- a/tools/qmlcachegen/qmlcachegen.cpp +++ b/tools/qmlcachegen/qmlcachegen.cpp @@ -66,6 +66,8 @@ int main(int argc, char **argv) parser.addHelpOption(); parser.addVersionOption(); + QCommandLineOption bareOption(QStringLiteral("bare"), QCoreApplication::translate("main", "Do not include default import directories. This may be used to run qmlcachegen on a project using a different Qt version.")); + parser.addOption(bareOption); QCommandLineOption filterResourceFileOption(QStringLiteral("filter-resource-file"), QCoreApplication::translate("main", "Filter out QML/JS files from a resource file that can be cached ahead of time instead")); parser.addOption(filterResourceFileOption); QCommandLineOption resourceFileMappingOption(QStringLiteral("resource-file-mapping"), QCoreApplication::translate("main", "Path from original resource file to new one"), QCoreApplication::translate("main", "old-name=new-name")); @@ -234,7 +236,8 @@ int main(int argc, char **argv) if (parser.isSet(importPathOption)) importPaths = parser.values(importPathOption); - importPaths.append(QLibraryInfo::path(QLibraryInfo::QmlImportsPath)); + if (!parser.isSet(bareOption)) + importPaths.append(QLibraryInfo::path(QLibraryInfo::QmlImportsPath)); QQmlJSImporter importer( importPaths, parser.isSet(resourceOption) ? &fileMapper : nullptr); diff --git a/tools/qmltc/main.cpp b/tools/qmltc/main.cpp index d3ba670ada..5314b1a2c0 100644 --- a/tools/qmltc/main.cpp +++ b/tools/qmltc/main.cpp @@ -53,6 +53,14 @@ int main(int argc, char **argv) parser.addHelpOption(); parser.addVersionOption(); + QCommandLineOption bareOption { + u"bare"_s, + QCoreApplication::translate( + "main", "Do not include default import directories. This may be used to run " + "qmltc on a project using a different Qt version.") + }; + parser.addOption(bareOption); + QCommandLineOption importPathOption { u"I"_s, QCoreApplication::translate("main", "Look for QML modules in specified directory"), QCoreApplication::translate("main", "import directory") @@ -124,7 +132,8 @@ int main(int argc, char **argv) return EXIT_FAILURE; QStringList importPaths = parser.values(importPathOption); - importPaths.append(QLibraryInfo::path(QLibraryInfo::QmlImportsPath)); + if (!parser.isSet(bareOption)) + importPaths.append(QLibraryInfo::path(QLibraryInfo::QmlImportsPath)); QStringList qmldirFiles = parser.values(qmldirOption); QString outputCppFile; |