Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Autotest for QVariant value types
  Fix memory leak
  Clarify Component.createObject(null) behavior.

1 files changed, 14 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
index a5cf051..ce857a0 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
+++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
@@ -77,6 +77,7 @@ private slots:
     void quaternion();
     void matrix4x4();
     void font();
+    void variant();
 
     void bindingAssignment();
     void bindingRead();
@@ -210,6 +211,19 @@ void tst_qdeclarativevaluetypes::sizef()
     }
 }
 
+void tst_qdeclarativevaluetypes::variant()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("variant_read.qml"));
+    MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
+    QVERIFY(object != 0);
+
+    QCOMPARE(float(object->property("s_width").toDouble()), float(0.1));
+    QCOMPARE(float(object->property("s_height").toDouble()), float(100923.2));
+    QCOMPARE(object->property("copy"), QVariant(QSizeF(0.1, 100923.2)));
+
+    delete object;
+}
+
 void tst_qdeclarativevaluetypes::sizereadonly()
 {
     {