From dbbbbe569da0aa3900a17ca22bd2be2708fb76f7 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Thu, 25 Apr 2019 15:21:19 +0200
Subject: Allow creation of variants from non-singleton QQmlTypeWrappers

I don't see any reason why this should be prohibited.

Change-Id: I4a54c55eff4b9151691d0587627efad4a06485f1
Fixes: QTBUG-74815
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 tests/auto/qml/qqmllanguage/data/typeWrapperToVariant.qml | 15 +++++++++++++++
 tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp          | 15 +++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 tests/auto/qml/qqmllanguage/data/typeWrapperToVariant.qml

(limited to 'tests')

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 85dddbcb54..87468c329c 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;
@@ -5085,6 +5087,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"
-- 
cgit v1.2.3