Remove AssignObject instruction

2 files changed, 14 insertions, 0 deletions

diff --git a/tests/auto/declarative/qmlparser/assignObjectToVariant.txt b/tests/auto/declarative/qmlparser/assignObjectToVariant.txt
new file mode 100644
index 0000000..180221d
--- /dev/null
+++ b/tests/auto/declarative/qmlparser/assignObjectToVariant.txt
@@ -0,0 +1,4 @@
+Object {
+    property var a;
+    a: MyQmlObject {}
+}
diff --git a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp
index 0852d35..cdc2a72 100644
--- a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp
+++ b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp
@@ -26,6 +26,7 @@ private slots:
     void interfaceQmlList();
     void interfaceQList();
     void assignObjectToSignal();
+    void assignObjectToVariant();
     void assignLiteralSignalProperty();
     void assignQmlComponent();
     void assignBasicTypes();
@@ -208,6 +209,15 @@ void tst_qmlparser::assignObjectToSignal()
     emit object->basicSignal();
 }
 
+void tst_qmlparser::assignObjectToVariant()
+{
+    QmlComponent component(&engine, TEST_FILE("assignObjectToVariant.txt"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QVariant v = object->property("a");
+    QVERIFY(v.userType() == qMetaTypeId<QObject *>());
+}
+
 void tst_qmlparser::assignLiteralSignalProperty()
 {
     QmlComponent component(&engine, TEST_FILE("assignLiteralSignalProperty.txt"));