Fix assigning objects to QJSValue properties

We support simple object bindings such as

    someProperty: Rectangle { ... }

when the type of "someProperty" is QVariant, but we produce an error
when it's QJSValue. There is no good reason for that, and the fix for
QTBUG-67118 requires this.

Change-Id: Ia5dc88749bcba0b5c781a6ab2b4a9fb92299e0ac
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 6 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmllanguage/data/assignLiteralToJSValue.qml b/tests/auto/qml/qqmllanguage/data/assignLiteralToJSValue.qml
index fce248a381..69b0096a5e 100644
--- a/tests/auto/qml/qqmllanguage/data/assignLiteralToJSValue.qml
+++ b/tests/auto/qml/qqmllanguage/data/assignLiteralToJSValue.qml
@@ -30,6 +30,7 @@ QtObject {
         MyQmlObject { id: testObj22; objectName: "test22"; qjsvalue: null },
         MyQmlObject { id: testObj1Bound; objectName: "test1Bound"; qjsvalue: testObj1.qjsvalue + 4 },  // 1 + 4 + 4 = 9
         MyQmlObject { id: testObj20Bound; objectName: "test20Bound"; qjsvalue: testObj20.qjsvalue(testObj1Bound.qjsvalue) }, // 9 * 3 = 27
+        MyQmlObject { id: testObj23; objectName: "test23"; qjsvalue: QtObject { objectName: "blah" } },
         QtObject {
             id: varProperties
             objectName: "varProperties"
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index f1f35f9fd4..18b1718ddf 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -934,6 +934,11 @@ void tst_qqmllanguage::assignLiteralToJSValue()
         QJSValue value = object->qjsvalue();
         QVERIFY(value.isNumber());
         QCOMPARE(value.toNumber(), qreal(27));
+    } {
+        MyQmlObject *object = root->findChild<MyQmlObject *>("test23");
+        QJSValue value = object->qjsvalue();
+        QVERIFY(value.isQObject());
+        QCOMPARE(value.toQObject()->objectName(), "blah");
     }
 }