diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-05 18:12:42 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-09 21:46:43 +0100 |
commit | b17ccb8af9f9149d100e391af9e1c25e97a962d0 (patch) | |
tree | 2ed22a5c36b4e938a801500b7bd8e2773b9fe503 /tools | |
parent | dab0d62b655ce9a476993de2558a573a5066288c (diff) |
Use QLibraryInfo::QmlImportsPath rather than Qml2ImportsPath
The "2" is meaningless and there is a better name available now.
Task-number: QTBUG-85064
Change-Id: I65d26b06712ed7dcf2825f16dffaa6060dd86985
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qmlimportscanner/main.cpp | 2 | ||||
-rw-r--r-- | tools/qmllint/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp index 20f4a46d34..9313dee634 100644 --- a/tools/qmlimportscanner/main.cpp +++ b/tools/qmlimportscanner/main.cpp @@ -76,7 +76,7 @@ void printUsage(const QString &appNameIn) { const std::wstring appName = appNameIn.toStdWString(); #ifndef QT_BOOTSTRAPPED - const QString qmlPath = QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath); + const QString qmlPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath); #else const QString qmlPath = QStringLiteral("/home/user/dev/qt-install/qml"); #endif diff --git a/tools/qmllint/main.cpp b/tools/qmllint/main.cpp index 428925c2e8..b41b0dcb3d 100644 --- a/tools/qmllint/main.cpp +++ b/tools/qmllint/main.cpp @@ -160,7 +160,7 @@ int main(int argv, char *argc[]) QStringList qmlImportPaths = parser.isSet(qmlImportPathsOption) ? parser.values(qmlImportPathsOption) # ifndef QT_BOOTSTRAPPED - : QStringList { QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath), QDir::currentPath() }; + : QStringList { QLibraryInfo::path(QLibraryInfo::QmlImportsPath), QDir::currentPath() }; # else : QStringList { QDir::currentPath() }; # endif |