Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I6f2152aeecaeb8e63fdbc1cdf1444132a054b6f5

11 files changed, 167 insertions, 7 deletions

diff --git a/tests/auto/qml/qqmlimport/CMakeLists.txt b/tests/auto/qml/qqmlimport/CMakeLists.txt
index 71f71c7326..50b588cb04 100644
--- a/tests/auto/qml/qqmlimport/CMakeLists.txt
+++ b/tests/auto/qml/qqmlimport/CMakeLists.txt
@@ -4,6 +4,32 @@
 ## tst_qqmlimport Test:
 #####################################################################
 
+# Collect test data
+
+file(GLOB test_data_glob
+    LIST_DIRECTORIES true
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    "data/*")
+list(APPEND test_data ${test_data_glob})
+
+file(GLOB test_data_glob
+    LIST_DIRECTORIES true
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    "MyPluginSupported/*")
+list(APPEND test_data ${test_data_glob})
+
+file(GLOB test_data_glob
+    LIST_DIRECTORIES true
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    "MyPluginUnsupported/*")
+list(APPEND test_data ${test_data_glob})
+
+file(GLOB test_data_glob
+    LIST_DIRECTORIES true
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    "FormFromQmlDir/*")
+list(APPEND test_data ${test_data_glob})
+
 add_qt_test(tst_qqmlimport
     GUI
     SOURCES
@@ -17,17 +43,12 @@ add_qt_test(tst_qqmlimport
         Qt::Gui
         Qt::Qml
         Qt::Quick
+    TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:qqmlimport.pro:<TRUE>:
-# CONFIG = "testcase"
-
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qqmlimport.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
-
 extend_target(tst_qqmlimport CONDITION ANDROID OR APPLE_IOS
     DEFINES
         QT_QMLTEST_DATADIR=\\\":/data\\\"
diff --git a/tests/auto/qml/qqmlimport/data/QTBUG-77102/imports/MyPlugin/MyComponent_0_9.qml b/tests/auto/qml/qqmlimport/data/QTBUG-77102/imports/MyPlugin/MyComponent_0_9.qml
new file mode 100644
index 0000000000..a63e2d121c
--- /dev/null
+++ b/tests/auto/qml/qqmlimport/data/QTBUG-77102/imports/MyPlugin/MyComponent_0_9.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+
+Rectangle {
+    width: 50
+    height: 50
+
+    color: "yellow"
+
+    Text {
+        anchors.centerIn: parent
+        text: "0.9"
+
+    }
+}
diff --git a/tests/auto/qml/qqmlimport/data/QTBUG-77102/imports/MyPlugin/MyComponent_1_0.qml b/tests/auto/qml/qqmlimport/data/QTBUG-77102/imports/MyPlugin/MyComponent_1_0.qml
new file mode 100644
index 0000000000..d9cff582bb
--- /dev/null
+++ b/tests/auto/qml/qqmlimport/data/QTBUG-77102/imports/MyPlugin/MyComponent_1_0.qml
@@ -0,0 +1,15 @@
+
+import QtQuick 2.0
+
+Rectangle {
+    width: 50
+    height: 50
+
+    color: "orange"
+
+    Text {
+        anchors.centerIn: parent
+        text: "1.0"
+
+    }
+}
diff --git a/tests/auto/qml/qqmlimport/data/QTBUG-77102/imports/MyPlugin/MySettings_1_0.qml b/tests/auto/qml/qqmlimport/data/QTBUG-77102/imports/MyPlugin/MySettings_1_0.qml
new file mode 100644
index 0000000000..63ad6ba1a5
--- /dev/null
+++ b/tests/auto/qml/qqmlimport/data/QTBUG-77102/imports/MyPlugin/MySettings_1_0.qml
@@ -0,0 +1,7 @@
+pragma Singleton
+
+import QtQuick 2.0
+
+Item {
+    property int baseWidth: 50
+}
diff --git a/tests/auto/qml/qqmlimport/data/QTBUG-77102/imports/MyPlugin/qmldir b/tests/auto/qml/qqmlimport/data/QTBUG-77102/imports/MyPlugin/qmldir
new file mode 100644
index 0000000000..57b8c55f81
--- /dev/null
+++ b/tests/auto/qml/qqmlimport/data/QTBUG-77102/imports/MyPlugin/qmldir
@@ -0,0 +1,6 @@
+module MyPlugin
+
+MyComponent 0.9 MyComponent_0_9.qml
+
+MyComponent 1.0 MyComponent_1_0.qml
+singleton MySettings 1.0 MySettings_1_0.qml
diff --git a/tests/auto/qml/qqmlimport/data/QTBUG-77102/main.0.9.fail.qml b/tests/auto/qml/qqmlimport/data/QTBUG-77102/main.0.9.fail.qml
new file mode 100644
index 0000000000..0fbcec607a
--- /dev/null
+++ b/tests/auto/qml/qqmlimport/data/QTBUG-77102/main.0.9.fail.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.12
+import MyPlugin 0.9
+
+Item {
+    width: MySettings.baseWidth
+    height: 100
+
+    MyComponent {
+        anchors.centerIn: parent
+    }
+}
diff --git a/tests/auto/qml/qqmlimport/data/QTBUG-77102/main.0.9.qml b/tests/auto/qml/qqmlimport/data/QTBUG-77102/main.0.9.qml
new file mode 100644
index 0000000000..53fc25699c
--- /dev/null
+++ b/tests/auto/qml/qqmlimport/data/QTBUG-77102/main.0.9.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.12
+import MyPlugin 0.9
+
+Item {
+    width: 100
+    height: 100
+
+    MyComponent {
+        anchors.centerIn: parent
+    }
+}
diff --git a/tests/auto/qml/qqmlimport/data/QTBUG-77102/main.1.0.qml b/tests/auto/qml/qqmlimport/data/QTBUG-77102/main.1.0.qml
new file mode 100644
index 0000000000..1f6244068b
--- /dev/null
+++ b/tests/auto/qml/qqmlimport/data/QTBUG-77102/main.1.0.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.12
+import MyPlugin 1.0
+
+Item {
+    width: MySettings.baseWidth
+    height: 100
+
+    MyComponent {
+        anchors.centerIn: parent
+    }
+}
diff --git a/tests/auto/qml/qqmlimport/data/QTBUG-77102/main.nonumber.qml b/tests/auto/qml/qqmlimport/data/QTBUG-77102/main.nonumber.qml
new file mode 100644
index 0000000000..dea00c0163
--- /dev/null
+++ b/tests/auto/qml/qqmlimport/data/QTBUG-77102/main.nonumber.qml
@@ -0,0 +1,11 @@
+import QtQuick 2.12
+import "imports/MyPlugin"
+
+Item {
+    width: MySettings.baseWidth
+    height: 100
+
+    MyComponent {
+        anchors.centerIn: parent
+    }
+}
diff --git a/tests/auto/qml/qqmlimport/qqmlimport.pro b/tests/auto/qml/qqmlimport/qqmlimport.pro
index c8b0f68d9f..ba80547f4e 100644
--- a/tests/auto/qml/qqmlimport/qqmlimport.pro
+++ b/tests/auto/qml/qqmlimport/qqmlimport.pro
@@ -6,3 +6,8 @@ osx:CONFIG -= app_bundle
 SOURCES += tst_qqmlimport.cpp
 
 include (../../shared/util.pri)
+
+TESTDATA = data/* \
+           MyPluginSupported/* \
+           MyPluginUnsupported/* \
+           FormFromQmlDir/*
diff --git a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
index a3cb68fdcb..ca1e52ad2c 100644
--- a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
+++ b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
@@ -45,6 +45,7 @@ private slots:
     void completeQmldirPaths_data();
     void completeQmldirPaths();
     void interceptQmldir();
+    void singletonVersionResolution();
     void cleanup();
 };
 
@@ -77,7 +78,7 @@ void tst_QQmlImport::testDesignerSupported()
     QVERIFY(window->errors().isEmpty());
 
     QString warningString("%1:30:1: module does not support the designer \"MyPluginUnsupported\" \n     import MyPluginUnsupported 1.0\r \n     ^ ");
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID)
     warningString.remove('\r');
 #endif
     warningString = warningString.arg(testFileUrl("testfile_unsupported.qml").toString());
@@ -129,6 +130,9 @@ void tst_QQmlImport::uiFormatLoading()
 
 void tst_QQmlImport::importPathOrder()
 {
+#ifdef Q_OS_ANDROID
+    QSKIP("QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath) returns bogus path on Android, but its nevertheless unusable.");
+#endif
     QStringList expectedImportPaths;
     QString appDirPath = QCoreApplication::applicationDirPath();
     QString qml2Imports = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
@@ -212,6 +216,50 @@ void tst_QQmlImport::interceptQmldir()
     QVERIFY(!obj.isNull());
 }
 
+// QTBUG-77102
+void tst_QQmlImport::singletonVersionResolution()
+{
+    QQmlEngine engine;
+    engine.addImportPath(testFile("QTBUG-77102/imports"));
+    {
+        // Singleton with higher version is simply ignored when importing lower version of plugin
+        QQmlComponent component(&engine);
+        component.loadUrl(testFileUrl("QTBUG-77102/main.0.9.qml"));
+        QVERIFY(component.isReady());
+        QScopedPointer<QObject> obj(component.create());
+        QVERIFY(!obj.isNull());
+    }
+    {
+        // but the singleton is not accessible
+        QQmlComponent component(&engine);
+        QTest::ignoreMessage(QtMsgType::QtWarningMsg, QRegularExpression {".*ReferenceError: MySettings is not defined$"} );
+        component.loadUrl(testFileUrl("QTBUG-77102/main.0.9.fail.qml"));
+        QVERIFY(component.isReady());
+        QScopedPointer<QObject> obj(component.create());
+        QVERIFY(!obj.isNull());
+    }
+    {
+        // unless a version which is high enough is imported
+        QQmlComponent component(&engine);
+        component.loadUrl(testFileUrl("QTBUG-77102/main.1.0.qml"));
+        QVERIFY(component.isReady());
+        QScopedPointer<QObject> obj(component.create());
+        QVERIFY(!obj.isNull());
+        auto item = qobject_cast<QQuickItem*>(obj.get());
+        QCOMPARE(item->width(), 50);
+    }
+    {
+        // or when there is no number because we are importing from a path
+        QQmlComponent component(&engine);
+        component.loadUrl(testFileUrl("QTBUG-77102/main.nonumber.qml"));
+        QVERIFY(component.isReady());
+        QScopedPointer<QObject> obj(component.create());
+        QVERIFY(!obj.isNull());
+        auto item = qobject_cast<QQuickItem*>(obj.get());
+        QCOMPARE(item->width(), 50);
+    }
+}
+
 
 QTEST_MAIN(tst_QQmlImport)