Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I552629813ea8100d04ea19e51fe7198931082e19

4 files changed, 36 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmllanguage/data/typeWrapperToVariant.qml b/tests/auto/qml/qqmllanguage/data/typeWrapperToVariant.qml
new file mode 100644
index 0000000000..8a1535ff50
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/typeWrapperToVariant.qml
@@ -0,0 +1,15 @@
+import QtQml 2.0
+
+QtObject {
+    id: root
+
+    property QtObject target: QtObject {
+        Component.onCompleted: {
+            root.connections.target = root.target.Component
+        }
+    }
+
+    property Connections connections: Connections {
+        ignoreUnknownSignals: true
+    }
+}
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index fe2256319b..63fc55ad0f 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -301,6 +301,8 @@ private slots:
     void polymorphicFunctionLookup();
     void anchorsToParentInPropertyChanges();
 
+    void typeWrapperToVariant();
+
 private:
     QQmlEngine engine;
     QStringList defaultImportPathList;
@@ -5087,6 +5089,19 @@ void tst_qqmllanguage::anchorsToParentInPropertyChanges()
     QTRY_COMPARE(o->property("edgeWidth").toInt(), 200);
 }
 
+void tst_qqmllanguage::typeWrapperToVariant()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("typeWrapperToVariant.qml"));
+    VERIFY_ERRORS(0);
+    QScopedPointer<QObject> o(component.create());
+    QVERIFY(!o.isNull());
+    QObject *connections = qvariant_cast<QObject *>(o->property("connections"));
+    QVERIFY(connections);
+    QObject *target = qvariant_cast<QObject *>(connections->property("target"));
+    QVERIFY(target);
+}
+
 QTEST_MAIN(tst_qqmllanguage)
 
 #include "tst_qqmllanguage.moc"
diff --git a/tests/auto/quick/qquickwindow/BLACKLIST b/tests/auto/quick/qquickwindow/BLACKLIST
index bb9f403188..1282a9d5ec 100644
--- a/tests/auto/quick/qquickwindow/BLACKLIST
+++ b/tests/auto/quick/qquickwindow/BLACKLIST
@@ -1,3 +1,6 @@
+[openglContextCreatedSignal]
+opensuse-42.3
+opensuse-leap
 # QTBUG-62177
 [attachedProperty]
 osx
diff --git a/tests/auto/quickwidgets/qquickwidget/BLACKLIST b/tests/auto/quickwidgets/qquickwidget/BLACKLIST
new file mode 100644
index 0000000000..18ea65bb72
--- /dev/null
+++ b/tests/auto/quickwidgets/qquickwidget/BLACKLIST
@@ -0,0 +1,3 @@
+[tabKey]
+opensuse-42.3
+opensuse-leap