diff options
Diffstat (limited to 'tests/auto/qml/qqmlimport')
-rw-r--r-- | tests/auto/qml/qqmlimport/BLACKLIST | 3 | ||||
-rw-r--r-- | tests/auto/qml/qqmlimport/tst_qqmlimport.cpp | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/tests/auto/qml/qqmlimport/BLACKLIST b/tests/auto/qml/qqmlimport/BLACKLIST deleted file mode 100644 index dfd4d646da..0000000000 --- a/tests/auto/qml/qqmlimport/BLACKLIST +++ /dev/null @@ -1,3 +0,0 @@ -[importPathOrder] -msvc-2019 -windows-10 gcc developer-build diff --git a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp index 94da02f80f..df3d2ba625 100644 --- a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp +++ b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp @@ -181,17 +181,18 @@ void tst_QQmlImport::importPathOrder() << QLatin1String("qrc:/qt-project.org/imports") << qml2Imports; QQmlEngine engine; - QCOMPARE(expectedImportPaths, engine.importPathList()); + QCOMPARE(engine.importPathList(), expectedImportPaths); // Add an import path engine.addImportPath(QT_QMLTEST_DATADIR); - expectedImportPaths.prepend(QT_QMLTEST_DATADIR); - QCOMPARE(expectedImportPaths, engine.importPathList()); + QFileInfo fi(QT_QMLTEST_DATADIR); + expectedImportPaths.prepend(fi.absoluteFilePath()); + QCOMPARE(engine.importPathList(), expectedImportPaths); // Add qml2Imports again to make it the first of the list engine.addImportPath(qml2Imports); expectedImportPaths.move(expectedImportPaths.indexOf(qml2Imports), 0); - QCOMPARE(expectedImportPaths, engine.importPathList()); + QCOMPARE(engine.importPathList(), expectedImportPaths); } Q_DECLARE_METATYPE(QQmlImports::ImportVersion) |