aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlimport
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2021-02-05 18:12:42 +0100
committerUlf Hermann <ulf.hermann@qt.io>2021-02-09 21:46:43 +0100
commitb17ccb8af9f9149d100e391af9e1c25e97a962d0 (patch)
tree2ed22a5c36b4e938a801500b7bd8e2773b9fe503 /tests/auto/qml/qqmlimport
parentdab0d62b655ce9a476993de2558a573a5066288c (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 'tests/auto/qml/qqmlimport')
-rw-r--r--tests/auto/qml/qqmlimport/tst_qqmlimport.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
index 8229b79702..92565cc591 100644
--- a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
+++ b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
@@ -166,11 +166,11 @@ void tst_QQmlImport::uiFormatLoading()
void tst_QQmlImport::importPathOrder()
{
#ifdef Q_OS_ANDROID
- QSKIP("QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath) returns bogus path on Android, but its nevertheless unusable.");
+ QSKIP("QLibraryInfo::path(QLibraryInfo::QmlImportsPath) returns bogus path on Android, but its nevertheless unusable.");
#endif
QStringList expectedImportPaths;
QString appDirPath = QCoreApplication::applicationDirPath();
- QString qml2Imports = QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath);
+ QString qml2Imports = QLibraryInfo::path(QLibraryInfo::QmlImportsPath);
#ifdef Q_OS_WIN
// The drive letter has a different case as QQmlImport will
// cause it to be converted after passing through QUrl