Fix value-type semantics in variant properties

Previously, variant properties storing value-type values would be
treated as value-type-copy values rather than value-type-reference
values.  This caused inconsistency in behaviour with value-type
subproperty assignment.

Task-number: QTBUG-26562
Change-Id: I524ee06ab8e02bf9582c1a88f3317278199225e0
Reviewed-by: Martin Jones <martin.jones@nokia.com>

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
index af5e914290..a323db5d5f 100644
--- a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
+++ b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
@@ -290,6 +290,7 @@ void tst_qqmlvaluetypes::sizef()
 
 void tst_qqmlvaluetypes::variant()
 {
+    {
     QQmlComponent component(&engine, testFileUrl("variant_read.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
@@ -299,6 +300,27 @@ void tst_qqmlvaluetypes::variant()
     QCOMPARE(object->property("copy"), QVariant(QSizeF(0.1, 100923.2)));
 
     delete object;
+    }
+
+    {
+    QString w1 = testFileUrl("variant_write.1.qml").toString() + QLatin1String(":9: TypeError: Object QVector2D(8, 2) has no method 'plus'");
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(w1));
+    QQmlComponent component(&engine, testFileUrl("variant_write.1.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QVERIFY(object->property("complete").toBool());
+    QVERIFY(object->property("success").toBool());
+    delete object;
+    }
+
+    {
+    QQmlComponent component(&engine, testFileUrl("variant_write.2.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QVERIFY(object->property("complete").toBool());
+    QVERIFY(object->property("success").toBool());
+    delete object;
+    }
 }
 
 void tst_qqmlvaluetypes::sizereadonly()