QmlDesigner.Test: Fix type versions

Change-Id: I2450094776b50dbaf7ad41807990d3505057ab8d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

1 files changed, 216 insertions, 216 deletions

diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
index 7d9a3d8cf2..4c99297d2e 100644
--- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
+++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
@@ -210,15 +210,15 @@ void tst_TestCore::testRewriterView()
         testRewriterView->setTextModifier(&textModifier);
         model->attachView(testRewriterView.data());
 
-        ModelNode childNode(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data"));
+        ModelNode childNode(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data"));
         QVERIFY(childNode.isValid());
         childNode.setId("childNode");
 
-        ModelNode childNode2(addNodeListChild(childNode, "QtQuick.Rectangle", 4, 7, "data"));
+        ModelNode childNode2(addNodeListChild(childNode, "QtQuick.Rectangle", 1, 1, "data"));
         childNode2.setId("childNode2");
-        ModelNode childNode3(addNodeListChild(childNode2, "QtQuick.Rectangle", 4, 7, "data"));
+        ModelNode childNode3(addNodeListChild(childNode2, "QtQuick.Rectangle", 1, 1, "data"));
         childNode3.setId("childNode3");
-        ModelNode childNode4(addNodeListChild(childNode3, "QtQuick.Rectangle", 4, 7, "data"));
+        ModelNode childNode4(addNodeListChild(childNode3, "QtQuick.Rectangle", 1, 1, "data"));
         childNode4.setId("childNode4");
 
         QVERIFY(childNode.isValid());
@@ -244,7 +244,7 @@ void tst_TestCore::testRewriterView()
 
         testRewriterView->modelToTextMerger()->applyChanges();
 
-        childNode = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
+        childNode = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
         QVERIFY(testRewriterView->modelToTextMerger()->isNodeScheduledForAddition(childNode));
 
         testRewriterView->modelToTextMerger()->applyChanges();
@@ -407,7 +407,7 @@ void tst_TestCore::testModelCreateRect()
     model->attachView(view.data());
 
     QVERIFY(view->rootModelNode().isValid());
-    ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 1, 1, "data");
     QVERIFY(childNode.isValid());
     QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
     QVERIFY(childNode.parentProperty().parentModelNode() == view->rootModelNode());
@@ -677,7 +677,7 @@ void tst_TestCore::testRewriterPreserveOrder()
 
         RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
 
-        ModelNode newModelNode = testRewriterView->createModelNode("QtQuick.Rectangle", 4, 7);
+        ModelNode newModelNode = testRewriterView->createModelNode("QtQuick.Rectangle", 1, 1);
 
         newModelNode.setParentProperty(rootModelNode.nodeAbstractProperty("data"));
 
@@ -712,7 +712,7 @@ void tst_TestCore::testRewriterPreserveOrder()
 
         RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
 
-        ModelNode newModelNode = testRewriterView->createModelNode("QtQuick.Rectangle", 4, 7);
+        ModelNode newModelNode = testRewriterView->createModelNode("QtQuick.Rectangle", 1, 1);
 
         newModelNode.setParentProperty(rootModelNode.nodeAbstractProperty("data"));
 
@@ -982,7 +982,7 @@ void tst_TestCore::testRewriterForGradientMagic()
     myRect.variantProperty("rotation") = QVariant(45);
     QVERIFY(myRect.isValid());
 
-    QScopedPointer<Model> model1(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model1(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model1.data());
 
     QScopedPointer<TestView> view1(new TestView(model1.data()));
@@ -1046,7 +1046,7 @@ void tst_TestCore::testModelCreateSubNode()
     QCOMPARE(view->methodCalls(), expectedCalls);
 
     QVERIFY(view->rootModelNode().isValid());
-    ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 1, 1, "data");
     QVERIFY(childNode.isValid());
     QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
     QVERIFY(childNode.parentProperty().parentModelNode() == view->rootModelNode());
@@ -1302,8 +1302,8 @@ void tst_TestCore::testModelBasicOperations()
     QVERIFY(!rootModelNode.hasProperty("width"));
 
     QVERIFY(!rootModelNode.hasProperty("children"));
-    ModelNode childNode1(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "children"));
-    ModelNode childNode2(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data"));
+    ModelNode childNode1(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "children"));
+    ModelNode childNode2(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data"));
 
     QVERIFY(childNode1.isValid());
     QVERIFY(childNode2.isValid());
@@ -1351,9 +1351,9 @@ void tst_TestCore::testModelResolveIds()
     ModelNode rootNode = view->rootModelNode();
     rootNode.setId("rootNode");
 
-    ModelNode childNode1(addNodeListChild(rootNode, "QtQuick.Rectangle", 4, 7, "children"));
+    ModelNode childNode1(addNodeListChild(rootNode, "QtQuick.Rectangle", 1, 1, "children"));
 
-    ModelNode childNode2(addNodeListChild(childNode1, "QtQuick.Rectangle", 4, 7, "children"));
+    ModelNode childNode2(addNodeListChild(childNode1, "QtQuick.Rectangle", 1, 1, "children"));
     childNode2.setId("childNode2");
     childNode2.bindingProperty("test").setExpression("parent.parent");
 
@@ -1364,7 +1364,7 @@ void tst_TestCore::testModelResolveIds()
     childNode2.bindingProperty("test").setExpression("rootNode");
     QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), rootNode);
 
-    ModelNode childNode3(addNodeListChild(childNode2, "QtQuick.Rectangle", 4, 7, "children"));
+    ModelNode childNode3(addNodeListChild(childNode2, "QtQuick.Rectangle", 1, 1, "children"));
     childNode3.setId("childNode3");
     childNode2.nodeProperty("front").setModelNode(childNode3);
     childNode2.bindingProperty("test").setExpression("childNode3.parent");
@@ -1417,7 +1417,7 @@ void tst_TestCore::testModelNodeListProperty()
     QVERIFY(!rootChildren.isNodeListProperty());
     QVERIFY(rootChildren.isEmpty());
 
-    ModelNode rectNode = view->createModelNode("QtQuick.Rectangle", 4, 7);
+    ModelNode rectNode = view->createModelNode("QtQuick.Rectangle", 1, 1);
     rootChildren.reparentHere(rectNode);
 
     //
@@ -1428,7 +1428,7 @@ void tst_TestCore::testModelNodeListProperty()
     QVERIFY(rootChildren.isNodeListProperty());
     QVERIFY(!rootChildren.isEmpty());
 
-    ModelNode mouseAreaNode = view->createModelNode("QtQuick.Item", 4, 7);
+    ModelNode mouseAreaNode = view->createModelNode("QtQuick.Item", 1, 1);
     NodeListProperty rectChildren = rectNode.nodeListProperty("children");
     rectChildren.reparentHere(mouseAreaNode);
 
@@ -1487,8 +1487,8 @@ void tst_TestCore::testBasicOperationsWithView()
     QCOMPARE(rootInstance.size().width(), 10.0);
     QCOMPARE(rootInstance.size().height(), 10.0);
 
-    ModelNode childNode(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data"));
-    ModelNode childNode2(addNodeListChild(childNode, "QtQuick.Rectangle", 4, 7, "data"));
+    ModelNode childNode(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data"));
+    ModelNode childNode2(addNodeListChild(childNode, "QtQuick.Rectangle", 1, 1, "data"));
     QVERIFY(childNode2.parentProperty().parentModelNode() == childNode);
 
     QVERIFY(childNode.isValid());
@@ -1522,10 +1522,10 @@ void tst_TestCore::testBasicOperationsWithView()
         QVERIFY(!childInstance2.isValid());
     }
 
-    childNode = addNodeListChild(rootModelNode, "QtQuick.Image", 4, 7, "data");
+    childNode = addNodeListChild(rootModelNode, "QtQuick.Image", 1, 1, "data");
     QVERIFY(childNode.isValid());
     QCOMPARE(childNode.type(), QString("QtQuick.Image"));
-    childNode2 = addNodeListChild(childNode, "QtQuick.Rectangle", 4, 7, "data");
+    childNode2 = addNodeListChild(childNode, "QtQuick.Rectangle", 1, 1, "data");
     QVERIFY(childNode2.isValid());
     childNode2.setParentProperty(rootModelNode, "data");
     QVERIFY(childNode2.isValid());
@@ -1581,7 +1581,7 @@ void tst_TestCore::testQmlModelView()
     propertyList.append(qMakePair(QString("width"), QVariant(20)));
     propertyList.append(qMakePair(QString("height"), QVariant(20)));
 
-    QmlObjectNode node1 = view->createQmlObjectNode("QtQuick.Rectangle", 4, 7, propertyList);
+    QmlObjectNode node1 = view->createQmlObjectNode("QtQuick.Rectangle", 1, 1, propertyList);
 
     QVERIFY(node1.isValid());
     QVERIFY(!node1.hasNodeParent());
@@ -1597,7 +1597,7 @@ void tst_TestCore::testQmlModelView()
     QVERIFY(node1.instanceParent() == view->rootQmlObjectNode());
 
 
-    QmlObjectNode node2 = view->createQmlObjectNode("QtQuick.Rectangle", 4, 7, propertyList);
+    QmlObjectNode node2 = view->createQmlObjectNode("QtQuick.Rectangle", 1, 1, propertyList);
 
     QVERIFY(node2.isValid());
     QVERIFY(!node2.hasNodeParent());
@@ -1625,12 +1625,12 @@ void tst_TestCore::testQmlModelView()
     QCOMPARE(node1.instanceValue("x").toInt(), 2);
 
 
-    QmlObjectNode node3 = view->createQmlObjectNode("QtQuick.Rectangle", 4, 7, propertyList);
-    QmlObjectNode node4 = view->createQmlObjectNode("QtQuick.Rectangle", 4, 7, propertyList);
-    QmlObjectNode node5 = view->createQmlObjectNode("QtQuick.Rectangle", 4, 7, propertyList);
-    QmlObjectNode node6 = view->createQmlObjectNode("QtQuick.Rectangle", 4, 7, propertyList);
-    QmlObjectNode node7 = view->createQmlObjectNode("QtQuick.Rectangle", 4, 7, propertyList);
-    QmlObjectNode node8 = view->createQmlObjectNode("QtQuick.Rectangle", 4, 7, propertyList);
+    QmlObjectNode node3 = view->createQmlObjectNode("QtQuick.Rectangle", 1, 1, propertyList);
+    QmlObjectNode node4 = view->createQmlObjectNode("QtQuick.Rectangle", 1, 1, propertyList);
+    QmlObjectNode node5 = view->createQmlObjectNode("QtQuick.Rectangle", 1, 1, propertyList);
+    QmlObjectNode node6 = view->createQmlObjectNode("QtQuick.Rectangle", 1, 1, propertyList);
+    QmlObjectNode node7 = view->createQmlObjectNode("QtQuick.Rectangle", 1, 1, propertyList);
+    QmlObjectNode node8 = view->createQmlObjectNode("QtQuick.Rectangle", 1, 1, propertyList);
 
     node3.setParentProperty(node2.nodeAbstractProperty("children"));
     node4.setParentProperty(node3.nodeAbstractProperty("children"));
@@ -1658,12 +1658,12 @@ void tst_TestCore::testQmlModelView()
 
     QCOMPARE(node2.instanceValue("x").toInt(), 10); // is this right? or should it be a invalid qvariant?
 
-    node1 = view->createQmlObjectNode("QtQuick.Rectangle", 4, 7, propertyList);
+    node1 = view->createQmlObjectNode("QtQuick.Rectangle", 1, 1, propertyList);
     node1.setId("node1");
 
     QCOMPARE(node2.instanceValue("x").toInt(), 20);
 
-    node3 = view->createQmlObjectNode("QtQuick.Rectangle", 4, 7, propertyList);
+    node3 = view->createQmlObjectNode("QtQuick.Rectangle", 1, 1, propertyList);
     node3.setParentProperty(node2.nodeAbstractProperty("children"));
     QCOMPARE(node3.instanceValue("width").toInt(), 20);
     node3.setVariantProperty("width", 0);
@@ -1698,7 +1698,7 @@ void tst_TestCore::testModelRemoveNode()
     QCOMPARE(view->rootModelNode().allDirectSubModelNodes().count(), 0);
 
 
-    ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 1, 1, "data");
     QVERIFY(childNode.isValid());
     QCOMPARE(view->rootModelNode().allDirectSubModelNodes().count(), 1);
     QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
@@ -1710,7 +1710,7 @@ void tst_TestCore::testModelRemoveNode()
         QVERIFY(childInstance.parentId() == view->rootModelNode().internalId());
     }
 
-    ModelNode subChildNode = addNodeListChild(childNode, "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode subChildNode = addNodeListChild(childNode, "QtQuick.Rectangle", 1, 1, "data");
     QVERIFY(subChildNode.isValid());
     QCOMPARE(childNode.allDirectSubModelNodes().count(), 1);
     QVERIFY(childNode.allDirectSubModelNodes().contains(subChildNode));
@@ -1741,7 +1741,7 @@ void tst_TestCore::testModelRemoveNode()
     QVERIFY(view->rootModelNode().isValid());
 
     // delete node not in hierarchy
-    childNode = view->createModelNode("QtQuick.Item", 4, 7);
+    childNode = view->createModelNode("QtQuick.Item", 1, 1);
     childNode.destroy();
 
     model->detachView(nodeInstanceView);
@@ -1766,7 +1766,7 @@ void tst_TestCore::reparentingNode()
     NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data(), NodeInstanceServerInterface::TestModus);
     model->attachView(nodeInstanceView);
 
-    ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
     QCOMPARE(childNode.parentProperty().parentModelNode(), rootModelNode);
     QVERIFY(rootModelNode.allDirectSubModelNodes().contains(childNode));
 
@@ -1776,7 +1776,7 @@ void tst_TestCore::reparentingNode()
         QVERIFY(childInstance.parentId() == view->rootModelNode().internalId());
     }
 
-    ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.Item", 4, 7, "data");
+    ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.Item", 1, 1, "data");
     QCOMPARE(childNode2.parentProperty().parentModelNode(), rootModelNode);
     QVERIFY(rootModelNode.allDirectSubModelNodes().contains(childNode2));
 
@@ -1836,7 +1836,7 @@ void tst_TestCore::reparentingNodeLikeDragAndDrop()
     view->rootModelNode().setId("rootModelNode");
     QCOMPARE(view->rootModelNode().id(), QString("rootModelNode"));
 
-    ModelNode rectNode = addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode rectNode = addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 1, 1, "data");
     rectNode.setId("rect_1");
     rectNode.variantProperty("x").setValue(20);
     rectNode.variantProperty("y").setValue(30);
@@ -1845,7 +1845,7 @@ void tst_TestCore::reparentingNodeLikeDragAndDrop()
 
     RewriterTransaction transaction(view->beginRewriterTransaction());
 
-    ModelNode textNode = addNodeListChild(view->rootModelNode(), "QtQuick.Text", 4, 7, "data");
+    ModelNode textNode = addNodeListChild(view->rootModelNode(), "QtQuick.Text", 1, 1, "data");
     QCOMPARE(textNode.parentProperty().parentModelNode(), view->rootModelNode());
     QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(textNode));
 
@@ -1946,11 +1946,11 @@ void tst_TestCore::testModelReorderSiblings()
     ModelNode rootModelNode = view->rootModelNode();
     QVERIFY(rootModelNode.isValid());
 
-    ModelNode a = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode a = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
     QVERIFY(a.isValid());
-    ModelNode b = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode b = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
     QVERIFY(b.isValid());
-    ModelNode c = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode c = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
     QVERIFY(c.isValid());
 
     {
@@ -1995,10 +1995,10 @@ void tst_TestCore::testModelRootNode()
         ModelNode rootModelNode = view->rootModelNode();
         QVERIFY(rootModelNode.isValid());
         QVERIFY(rootModelNode.isRootNode());
-        ModelNode topChildNode = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
+        ModelNode topChildNode = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
         QVERIFY(topChildNode.isValid());
         QVERIFY(rootModelNode.isRootNode());
-        ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
+        ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
         QVERIFY(childNode.isValid());
         QVERIFY(rootModelNode.isValid());
         QVERIFY(rootModelNode.isRootNode());
@@ -2022,8 +2022,8 @@ void tst_TestCore::reparentingNodeInModificationGroup()
     QVERIFY(view.data());
     model->attachView(view.data());
 
-    ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 4, 7, "data");
-    ModelNode childNode2 = addNodeListChild(view->rootModelNode(), "QtQuick.Item", 4, 7, "data");
+    ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 1, 1, "data");
+    ModelNode childNode2 = addNodeListChild(view->rootModelNode(), "QtQuick.Item", 1, 1, "data");
     childNode.variantProperty("x").setValue(10);
     childNode.variantProperty("y").setValue(10);
 
@@ -2128,7 +2128,7 @@ void tst_TestCore::testModelViewNotification()
     QCOMPARE(view1->methodCalls(), expectedCalls);
     QCOMPARE(view2->methodCalls(), expectedCalls);
 
-    ModelNode childNode = addNodeListChild(view2->rootModelNode(), "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode childNode = addNodeListChild(view2->rootModelNode(), "QtQuick.Rectangle", 1, 1, "data");
     expectedCalls << TestView::MethodCall("nodeCreated", QStringList() << "");
     expectedCalls << TestView::MethodCall("nodeReparented", QStringList() << "" << "data" << "" << "PropertiesAdded");
     QCOMPARE(view1->methodCalls(), expectedCalls);
@@ -2188,7 +2188,7 @@ void tst_TestCore::testRewriterTransaction()
     RewriterTransaction transaction = view->beginRewriterTransaction();
     QVERIFY(transaction.isValid());
 
-    ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 1, 1, "data");
     QVERIFY(childNode.isValid());
 
     childNode.destroy();
@@ -2198,7 +2198,7 @@ void tst_TestCore::testRewriterTransaction()
         RewriterTransaction transaction2 = view->beginRewriterTransaction();
         QVERIFY(transaction2.isValid());
 
-        ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 4, 7, "data");
+        ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 1, 1, "data");
         QVERIFY(childNode.isValid());
 
         childNode.destroy();
@@ -2252,7 +2252,7 @@ void tst_TestCore::testRewriterId()
 
     QVERIFY(rootModelNode.isValid());
 
-    ModelNode newNode(view->createModelNode("QtQuick.Rectangle", 4, 7));
+    ModelNode newNode(view->createModelNode("QtQuick.Rectangle", 1, 1));
     newNode.setId("testId");
 
     rootModelNode.nodeListProperty("data").reparentHere(newNode);
@@ -2294,12 +2294,12 @@ void tst_TestCore::testRewriterNodeReparentingTransaction1()
 
     QVERIFY(rootModelNode.isValid());
 
-    ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
-    ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
-    ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
-    ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
+    ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
+    ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
+    ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
 
-    ModelNode reparentNode = addNodeListChild(childNode1, "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode reparentNode = addNodeListChild(childNode1, "QtQuick.Rectangle", 1, 1, "data");
 
     RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
 
@@ -2339,8 +2339,8 @@ void tst_TestCore::testRewriterNodeReparentingTransaction2()
 
     QVERIFY(rootModelNode.isValid());
 
-    ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
-    ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
+    ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
 
     childNode2.variantProperty("x") = 200;
     childNode2.variantProperty("y") = 50;
@@ -2405,10 +2405,10 @@ void tst_TestCore::testRewriterNodeReparentingTransaction3()
 
    QVERIFY(rootModelNode.isValid());
 
-   ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
-   ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
-   ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
-   ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
+   ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
+   ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
+   ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
+   ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
 
    RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
 
@@ -2455,11 +2455,11 @@ void tst_TestCore::testRewriterNodeReparentingTransaction4()
 
    QVERIFY(rootModelNode.isValid());
 
-   ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
-   ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
-   ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
-   ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
-   ModelNode childNode5 = addNodeListChild(childNode2, "QtQuick.Rectangle", 4, 7, "data");
+   ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
+   ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
+   ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
+   ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
+   ModelNode childNode5 = addNodeListChild(childNode2, "QtQuick.Rectangle", 1, 1, "data");
 
    RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
 
@@ -2507,11 +2507,11 @@ void tst_TestCore::testRewriterAddNodeTransaction()
     QVERIFY(rootModelNode.isValid());
 
 
-    ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
 
     RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
 
-    ModelNode newNode = view->createModelNode("QtQuick.Rectangle", 4, 7);
+    ModelNode newNode = view->createModelNode("QtQuick.Rectangle", 1, 1);
     newNode.variantProperty("x") = 100;
     newNode.variantProperty("y") = 100;
 
@@ -2589,7 +2589,7 @@ void tst_TestCore::testRewriterTransactionRewriter()
 
     {
         RewriterTransaction transaction = view->beginRewriterTransaction();
-        childNode1 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
+        childNode1 = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
         childNode1.variantProperty("x") = 10;
         childNode1.variantProperty("y") = 10;
     }
@@ -2601,7 +2601,7 @@ void tst_TestCore::testRewriterTransactionRewriter()
 
     {
         RewriterTransaction transaction = view->beginRewriterTransaction();
-        childNode2 = addNodeListChild(childNode1, "QtQuick.Rectangle", 4, 7, "data");
+        childNode2 = addNodeListChild(childNode1, "QtQuick.Rectangle", 1, 1, "data");
         childNode2.destroy();
     }
 
@@ -2761,7 +2761,7 @@ void tst_TestCore::testRewriterPositionAndOffset()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2863,7 +2863,7 @@ void tst_TestCore::testRewriterComponentTextModifier()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2908,7 +2908,7 @@ void tst_TestCore::testRewriterComponentTextModifier()
 
     QCOMPARE(componentTextModifier.text(), qmlExpected);
 
-    QScopedPointer<Model> componentModel(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> componentModel(Model::create("QtQuick.Item", 1, 1));
     QScopedPointer<TestRewriterView> testRewriterViewComponent(new TestRewriterView());
     testRewriterViewComponent->setTextModifier(&componentTextModifier);
     componentModel->attachView(testRewriterViewComponent.data());
@@ -2933,7 +2933,7 @@ void tst_TestCore::testRewriterPreserveType()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2955,7 +2955,7 @@ void tst_TestCore::testRewriterPreserveType()
     textNode.variantProperty("font.bold") = QVariant(true);
     textNode.variantProperty("font.pointSize") = QVariant(13.0);
 
-    ModelNode newTextNode = addNodeListChild(rootNode, "QtQuick.Text", 4, 7, "data");
+    ModelNode newTextNode = addNodeListChild(rootNode, "QtQuick.Text", 1, 1, "data");
 
     newTextNode.variantProperty("font.bold") = QVariant(true);
     newTextNode.variantProperty("font.pointSize") = QVariant(13.0);
@@ -2978,7 +2978,7 @@ void tst_TestCore::testRewriterForArrayMagic()
         textEdit.setPlainText(qmlString);
         NotIndentingTextEditModifier textModifier(&textEdit);
 
-        QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+        QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
         QVERIFY(model.data());
 
         QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3030,7 +3030,7 @@ void tst_TestCore::testRewriterWithSignals()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3073,7 +3073,7 @@ void tst_TestCore::testRewriterNodeSliding()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3113,7 +3113,7 @@ void tst_TestCore::testRewriterExceptionHandling()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Text", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Text", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3169,7 +3169,7 @@ void tst_TestCore::testRewriterFirstDefinitionInside()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3239,7 +3239,7 @@ void tst_TestCore::testCopyModelRewriter1()
     textEdit1.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier1(&textEdit1);
 
-    QScopedPointer<Model> model1(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model1(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model1.data());
 
     QScopedPointer<TestView> view1(new TestView(model1.data()));
@@ -3258,7 +3258,7 @@ void tst_TestCore::testCopyModelRewriter1()
     textEdit2.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier2(&textEdit2);
 
-    QScopedPointer<Model> model2(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model2(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model2.data());
 
     QScopedPointer<TestView> view2(new TestView(model2.data()));
@@ -3420,7 +3420,7 @@ void tst_TestCore::testCopyModelRewriter2()
     textEdit1.setPlainText(qmlString1);
     NotIndentingTextEditModifier textModifier1(&textEdit1);
 
-    QScopedPointer<Model> model1(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model1(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model1.data());
 
     QScopedPointer<TestView> view1(new TestView(model1.data()));
@@ -3442,7 +3442,7 @@ void tst_TestCore::testCopyModelRewriter2()
     textEdit2.setPlainText(qmlString2);
     NotIndentingTextEditModifier textModifier2(&textEdit2);
 
-    QScopedPointer<Model> model2(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model2(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model2.data());
 
     QScopedPointer<TestView> view2(new TestView(model2.data()));
@@ -3526,7 +3526,7 @@ void tst_TestCore::testAnchorsAndRewriting()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3587,7 +3587,7 @@ void tst_TestCore::testAnchorsAndRewritingCenter()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3738,13 +3738,13 @@ void tst_TestCore::testMetaInfo()
     QVERIFY(model.data());
 
     // test whether default type is registered
-    QVERIFY(model->metaInfo("QtQuick.Item", 4, 7).isValid());
+    QVERIFY(model->metaInfo("QtQuick.Item", 1, 1).isValid());
 
     // test whether types from plugins are registered
     QVERIFY(model->hasNodeMetaInfo("QtWebKit/WebView", 1, 0));
 
     // test whether non-qml type is registered
-    QVERIFY(model->hasNodeMetaInfo("QGraphicsObject", 4, 7)); // Qt 4.7 namespace
+    QVERIFY(model->hasNodeMetaInfo("QGraphicsObject", 1, 1)); // Qt 4.7 namespace
     QVERIFY(model->hasNodeMetaInfo("QGraphicsObject", 1, 0)); // webkit 1.0 namespace
 }
 
@@ -3760,11 +3760,11 @@ void tst_TestCore::testMetaInfoSimpleType()
     QScopedPointer<Model> model(Model::create("QtQuick.Item"));
     QVERIFY(model.data());
 
-    QVERIFY(model->hasNodeMetaInfo("QtQuick.Item", 4, 7));
-    QVERIFY(model->hasNodeMetaInfo("QtQuick.Item", 4, 7));
+    QVERIFY(model->hasNodeMetaInfo("QtQuick.Item", 1, 1));
+    QVERIFY(model->hasNodeMetaInfo("QtQuick.Item", 1, 1));
 
-    NodeMetaInfo itemMetaInfo = model->metaInfo("QtQuick.Item", 4, 7);
-    NodeMetaInfo itemMetaInfo2 = model->metaInfo("QtQuick.Item", 4, 7);
+    NodeMetaInfo itemMetaInfo = model->metaInfo("QtQuick.Item", 1, 1);
+    NodeMetaInfo itemMetaInfo2 = model->metaInfo("QtQuick.Item", 1, 1);
 
     QVERIFY(itemMetaInfo.isValid());
     QCOMPARE(itemMetaInfo.typeName(), QLatin1String("QtQuick.Item"));
@@ -3779,11 +3779,11 @@ void tst_TestCore::testMetaInfoSimpleType()
     QCOMPARE(graphicsObjectInfo.minorVersion(), -1);
 
     QCOMPARE(itemMetaInfo.superClasses().size(), 2); // QGraphicsObject, QtQuick.QtObject
-    QVERIFY(itemMetaInfo.isSubclassOf("QGraphicsObject", 4, 7));
-    QVERIFY(itemMetaInfo.isSubclassOf("QtQuick.QtObject", 4, 7));
+    QVERIFY(itemMetaInfo.isSubclassOf("QGraphicsObject", 1, 1));
+    QVERIFY(itemMetaInfo.isSubclassOf("QtQuick.QtObject", 1, 1));
 
     // availableInVersion
-    QVERIFY(itemMetaInfo.availableInVersion(4, 7));
+    QVERIFY(itemMetaInfo.availableInVersion(1, 1));
     QVERIFY(itemMetaInfo.availableInVersion(4, 8));
     QVERIFY(itemMetaInfo.availableInVersion(5, 0));
     QVERIFY(itemMetaInfo.availableInVersion(-1, -1));
@@ -3803,7 +3803,7 @@ void tst_TestCore::testMetaInfoUncreatableType()
     QVERIFY(model.data());
 
     QVERIFY(model->hasNodeMetaInfo("QtQuick.Animation"));
-    NodeMetaInfo animationTypeInfo = model->metaInfo("QtQuick.Animation", 4, 7);
+    NodeMetaInfo animationTypeInfo = model->metaInfo("QtQuick.Animation", 1, 1);
     QVERIFY(animationTypeInfo.isValid());
 
     QVERIFY(animationTypeInfo.isValid());
@@ -3831,7 +3831,7 @@ void tst_TestCore::testMetaInfoExtendedType()
     QVERIFY(model.data());
 
     QVERIFY(model->hasNodeMetaInfo("QtQuick.QGraphicsWidget"));
-    NodeMetaInfo graphicsWidgetTypeInfo = model->metaInfo("QtQuick.QGraphicsWidget", 4, 7);
+    NodeMetaInfo graphicsWidgetTypeInfo = model->metaInfo("QtQuick.QGraphicsWidget", 1, 1);
     QVERIFY(graphicsWidgetTypeInfo.isValid());
     QVERIFY(graphicsWidgetTypeInfo.hasProperty("layout")); // from QGraphicsWidgetDeclarativeUI
     QVERIFY(graphicsWidgetTypeInfo.hasProperty("font")); // from QGraphicsWidget
@@ -3859,13 +3859,13 @@ void tst_TestCore::testMetaInfoCustomType()
 
     // Test type registered with qmlRegisterCustomType:
     //
-    // qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 4, 7, "PropertyChanges", new QDeclarativePropertyChangesParser);
+    // qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 1, 1, "PropertyChanges", new QDeclarativePropertyChangesParser);
 
     QScopedPointer<Model> model(Model::create("QtQuick.Item"));
     QVERIFY(model.data());
 
     QVERIFY(model->hasNodeMetaInfo("QtQuick.PropertyChanges"));
-    NodeMetaInfo propertyChangesInfo = model->metaInfo("QtQuick.PropertyChanges", 4, 7);
+    NodeMetaInfo propertyChangesInfo = model->metaInfo("QtQuick.PropertyChanges", 1, 1);
     QVERIFY(propertyChangesInfo.isValid());
     QVERIFY(propertyChangesInfo.hasProperty("target")); // from QDeclarativePropertyChanges
     QVERIFY(propertyChangesInfo.hasProperty("restoreEntryValues")); // from QDeclarativePropertyChanges
@@ -3915,7 +3915,7 @@ void tst_TestCore::testMetaInfoProperties()
     QScopedPointer<Model> model(Model::create("QtQuick.Text"));
     QVERIFY(model.data());
 
-    NodeMetaInfo textNodeMetaInfo = model->metaInfo("QtQuick.TextEdit", 4, 7);
+    NodeMetaInfo textNodeMetaInfo = model->metaInfo("QtQuick.TextEdit", 1, 1);
     QVERIFY(textNodeMetaInfo.hasProperty("text"));   // QDeclarativeTextEdit
     QVERIFY(textNodeMetaInfo.hasProperty("parent"));     // QDeclarativeItem
     QVERIFY(textNodeMetaInfo.hasProperty("x"));          // QGraphicsObject
@@ -3949,7 +3949,7 @@ void tst_TestCore::testMetaInfoDotProperties()
     QVERIFY(view->rootModelNode().metaInfo().propertyNames().contains("font.pointSize"));
     QVERIFY(view->rootModelNode().metaInfo().hasProperty("font.pointSize"));
 
-    ModelNode rectNode(addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 4, 7, "data"));
+    ModelNode rectNode(addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 1, 1, "data"));
 
 
     QVERIFY(rectNode.metaInfo().propertyNames().contains("pos.x"));
@@ -4064,7 +4064,7 @@ void tst_TestCore::testGradientsRewriter()
 
     QVERIFY(rootModelNode.isValid());
 
-    ModelNode rectNode(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data"));
+    ModelNode rectNode(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data"));
 
     const QLatin1String expected1("\nimport Qt 4.7\n"
                                   "\n"
@@ -4074,7 +4074,7 @@ void tst_TestCore::testGradientsRewriter()
                                   "}\n");
     QCOMPARE(textEdit.toPlainText(), expected1);
 
-    ModelNode gradientNode(addNodeChild(rectNode, "QtQuick.Gradient", 4, 7, "gradient"));
+    ModelNode gradientNode(addNodeChild(rectNode, "QtQuick.Gradient", 1, 1, "gradient"));
 
     QVERIFY(rectNode.hasNodeProperty("gradient"));
 
@@ -4095,7 +4095,7 @@ void tst_TestCore::testGradientsRewriter()
     propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0)));
     propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::red))));
 
-    ModelNode gradientStop1(gradientNode.view()->createModelNode("QtQuick.GradientStop", 4, 7, propertyList));
+    ModelNode gradientStop1(gradientNode.view()->createModelNode("QtQuick.GradientStop", 1, 1, propertyList));
     QVERIFY(gradientStop1.isValid());
     stops.reparentHere(gradientStop1);
 
@@ -4118,7 +4118,7 @@ void tst_TestCore::testGradientsRewriter()
     propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0.5)));
     propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::blue))));
 
-    ModelNode gradientStop2(gradientNode.view()->createModelNode("QtQuick.GradientStop", 4, 7, propertyList));
+    ModelNode gradientStop2(gradientNode.view()->createModelNode("QtQuick.GradientStop", 1, 1, propertyList));
     QVERIFY(gradientStop2.isValid());
     stops.reparentHere(gradientStop2);
 
@@ -4146,7 +4146,7 @@ void tst_TestCore::testGradientsRewriter()
     propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0.8)));
     propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::yellow))));
 
-    ModelNode gradientStop3(gradientNode.view()->createModelNode("QtQuick.GradientStop", 4, 7, propertyList));
+    ModelNode gradientStop3(gradientNode.view()->createModelNode("QtQuick.GradientStop", 1, 1, propertyList));
     QVERIFY(gradientStop3.isValid());
     stops.reparentHere(gradientStop3);
 
@@ -4194,7 +4194,7 @@ void tst_TestCore::testGradientsRewriter()
     propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0)));
     propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::blue))));
 
-    gradientStop1 = gradientNode.view()->createModelNode("QtQuick.GradientStop", 4, 7, propertyList);
+    gradientStop1 = gradientNode.view()->createModelNode("QtQuick.GradientStop", 1, 1, propertyList);
     QVERIFY(gradientStop1.isValid());
 
     stops.reparentHere(gradientStop1);
@@ -4263,7 +4263,7 @@ void tst_TestCore::testInstancesStates()
 //    }
 //
 
-//    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 4, 7));
+//    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 1, 1));
 //    QVERIFY(model.data());
 //    QScopedPointer<TestView> view(new TestView(model.data()));
 //    QVERIFY(view.data());
@@ -4274,28 +4274,28 @@ void tst_TestCore::testInstancesStates()
 //    //
 //    ModelNode rootNode = view->rootModelNode();
 
-//    ModelNode textNode = view->createModelNode("QtQuick.Text", 4, 7);
+//    ModelNode textNode = view->createModelNode("QtQuick.Text", 1, 1);
 //    textNode.setId("targetObject");
 //    textNode.variantProperty("text").setValue("base state");
 
 //    rootNode.nodeListProperty("data").reparentHere(textNode);
 
-//    ModelNode propertyChanges1Node = view->createModelNode("QtQuick.PropertyChanges", 4, 7);
+//    ModelNode propertyChanges1Node = view->createModelNode("QtQuick.PropertyChanges", 1, 1);
 //    propertyChanges1Node.bindingProperty("target").setExpression("targetObject");
 //    propertyChanges1Node.variantProperty("x").setValue(10);
 //    propertyChanges1Node.variantProperty("text").setValue("state1");
 
-//    ModelNode state1Node = view->createModelNode("QtQuick.State", 4, 7);
+//    ModelNode state1Node = view->createModelNode("QtQuick.State", 1, 1);
 //    state1Node.variantProperty("name").setValue("state1");
 //    state1Node.nodeListProperty("changes").reparentHere(propertyChanges1Node);
 
 //    rootNode.nodeListProperty("states").reparentHere(state1Node);
 
-//    ModelNode propertyChanges2Node = view->createModelNode("QtQuick.PropertyChanges", 4, 7);
+//    ModelNode propertyChanges2Node = view->createModelNode("QtQuick.PropertyChanges", 1, 1);
 //    propertyChanges2Node.bindingProperty("target").setExpression("targetObject");
 //    propertyChanges2Node.variantProperty("text").setValue("state2");
 
-//    ModelNode state2Node = view->createModelNode("QtQuick.State", 4, 7);
+//    ModelNode state2Node = view->createModelNode("QtQuick.State", 1, 1);
 //    state2Node.variantProperty("name").setValue("state2");
 //    state2Node.nodeListProperty("changes").reparentHere(propertyChanges2Node);
 
@@ -4392,7 +4392,7 @@ void tst_TestCore::testInstancesStates()
 //    //
 
 //    // move property changes of current state out of state
-//    ModelNode state3Node = view->createModelNode("QtQuick.State", 4, 7);
+//    ModelNode state3Node = view->createModelNode("QtQuick.State", 1, 1);
 //    QDeclarativeListReference changes(state1, "changes");
 //    QCOMPARE(changes.count(), 1);
 //    state3Node.nodeListProperty("changes").reparentHere(propertyChanges1Node);
@@ -4415,7 +4415,7 @@ void tst_TestCore::testInstancesStates()
 //    textNode.variantProperty("text").setValue("base state");
 
 //    // expressions
-//    ModelNode textNode2 = view->createModelNode("QtQuick.Text", 4, 7);
+//    ModelNode textNode2 = view->createModelNode("QtQuick.Text", 1, 1);
 //    textNode2.setId("targetObject2");
 //    textNode2.variantProperty("text").setValue("textNode2");
 
@@ -4494,7 +4494,7 @@ void tst_TestCore::testStates()
 //    }
 //
 
-//    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 4, 7));
+//    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 1, 1));
 //    QVERIFY(model.data());
 //    QScopedPointer<TestView> view(new TestView(model.data()));
 //    QVERIFY(view.data());
@@ -4503,7 +4503,7 @@ void tst_TestCore::testStates()
 //    // build up model
 //    ModelNode rootNode = view->rootModelNode();
 
-//    ModelNode textNode = view->createModelNode("QtQuick.Text", 4, 7);
+//    ModelNode textNode = view->createModelNode("QtQuick.Text", 1, 1);
 //    textNode.setId("targetObject");
 //    textNode.variantProperty("text").setValue("base state");
 
@@ -4590,7 +4590,7 @@ void tst_TestCore::testStatesBaseState()
 //    }
 //
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 1, 1));
     QVERIFY(model.data());
     QScopedPointer<TestView> view(new TestView(model.data()));
     QVERIFY(view.data());
@@ -4599,7 +4599,7 @@ void tst_TestCore::testStatesBaseState()
     // build up model
     ModelNode rootNode = view->rootModelNode();
 
-    ModelNode textNode = view->createModelNode("QtQuick.Text", 4, 7);
+    ModelNode textNode = view->createModelNode("QtQuick.Text", 1, 1);
     textNode.setId("targetObject");
     textNode.variantProperty("text").setValue("base state");
 
@@ -4625,7 +4625,7 @@ void tst_TestCore::testStatesBaseState()
     QVERIFY(textItem.propertyAffectedByCurrentState("text"));
     QCOMPARE(textItem.instanceValue("text"), QVariant("state 1"));
 
-    ModelNode newNode = view->createModelNode("QtQuick.Rectangle", 4, 7);
+    ModelNode newNode = view->createModelNode("QtQuick.Rectangle", 1, 1);
     QVERIFY(!QmlObjectNode(newNode).currentState().isBaseState());
 
     view->setCurrentState(view->baseState()); //set currentState base state
@@ -4647,7 +4647,7 @@ void tst_TestCore::testStatesBaseState()
 
 void tst_TestCore::testInstancesIdResolution()
 {
-    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 1, 1));
     QVERIFY(model.data());
     QScopedPointer<TestView> view(new TestView(model.data()));
     QVERIFY(view.data());
@@ -4671,7 +4671,7 @@ void tst_TestCore::testInstancesIdResolution()
     rootNode.variantProperty("width").setValue(100);
     rootNode.variantProperty("height").setValue(100);
 
-    ModelNode item1Node = view->createModelNode("QtQuick.Rectangle", 4, 7);
+    ModelNode item1Node = view->createModelNode("QtQuick.Rectangle", 1, 1);
     item1Node.setId("item1");
     item1Node.bindingProperty("width").setExpression("root.width");
     item1Node.bindingProperty("height").setExpression("item2.height");
@@ -4691,7 +4691,7 @@ void tst_TestCore::testInstancesIdResolution()
     //        height: root.height
     //      }
 
-    ModelNode item2Node = view->createModelNode("QtQuick.Rectangle", 4, 7);
+    ModelNode item2Node = view->createModelNode("QtQuick.Rectangle", 1, 1);
     item2Node.setId("item2");
     item2Node.bindingProperty("width").setExpression("root.width / 2");
     item2Node.bindingProperty("height").setExpression("root.height");
@@ -4716,7 +4716,7 @@ void tst_TestCore::testInstancesIdResolution()
     //        height: 80
     //      }
 
-    ModelNode item3Node = view->createModelNode("QtQuick.Rectangle", 4, 7);
+    ModelNode item3Node = view->createModelNode("QtQuick.Rectangle", 1, 1);
     item3Node.setId("item3");
     item3Node.variantProperty("height").setValue(80);
     rootNode.nodeListProperty("data").reparentHere(item3Node);
@@ -4734,16 +4734,16 @@ void tst_TestCore::testInstancesNotInScene()
     // test whether deleting an instance which is not in the scene crashes
     //
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 1, 1));
     QVERIFY(model.data());
     QScopedPointer<TestView> view(new TestView(model.data()));
     QVERIFY(view.data());
     model->attachView(view.data());
 
-    ModelNode node1 = view->createModelNode("QtQuick.Item", 4, 7);
+    ModelNode node1 = view->createModelNode("QtQuick.Item", 1, 1);
     node1.setId("node1");
 
-    ModelNode node2 = view->createModelNode("QtQuick.Item", 4, 7);
+    ModelNode node2 = view->createModelNode("QtQuick.Item", 1, 1);
     node2.setId("node2");
 
     node1.nodeListProperty("children").reparentHere(node2);
@@ -4755,21 +4755,21 @@ void tst_TestCore::testInstancesBindingsInStatesStress()
 {
     //This is a stress test to provoke a crash
     for (int j=0;j<20;j++) {
-        QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 4, 7));
+        QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 1, 1));
         QVERIFY(model.data());
         QScopedPointer<TestView> view(new TestView(model.data()));
         QVERIFY(view.data());
         model->attachView(view.data());
 
-        ModelNode node1 = view->createModelNode("QtQuick.Item", 4, 7);
+        ModelNode node1 = view->createModelNode("QtQuick.Item", 1, 1);
         node1.setId("node1");
 
         view->rootModelNode().nodeListProperty("children").reparentHere(node1);
 
-        ModelNode node2 = view->createModelNode("QtQuick.Rectangle", 4, 7);
+        ModelNode node2 = view->createModelNode("QtQuick.Rectangle", 1, 1);
         node2.setId("node2");
 
-        ModelNode node3 = view->createModelNode("QtQuick.Rectangle", 4, 7);
+        ModelNode node3 = view->createModelNode("QtQuick.Rectangle", 1, 1);
         node3.setId("node3");
 
         node1.nodeListProperty("children").reparentHere(node2);
@@ -4860,21 +4860,21 @@ void tst_TestCore::testInstancesPropertyChangeTargets()
         //this tests checks if a change of the target of a CropertyChange 
         //node is handled correctly
 
-        QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 4, 7));
+        QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 1, 1));
         QVERIFY(model.data());
         QScopedPointer<TestView> view(new TestView(model.data()));
         QVERIFY(view.data());
         model->attachView(view.data());
 
-        ModelNode node1 = view->createModelNode("QtQuick.Item", 4, 7);
+        ModelNode node1 = view->createModelNode("QtQuick.Item", 1, 1);
         node1.setId("node1");
 
         view->rootModelNode().nodeListProperty("children").reparentHere(node1);
 
-        ModelNode node2 = view->createModelNode("QtQuick.Rectangle", 4, 7);
+        ModelNode node2 = view->createModelNode("QtQuick.Rectangle", 1, 1);
         node2.setId("node2");
 
-        ModelNode node3 = view->createModelNode("QtQuick.Rectangle", 4, 7);
+        ModelNode node3 = view->createModelNode("QtQuick.Rectangle", 1, 1);
         node3.setId("node3");
 
         node1.nodeListProperty("children").reparentHere(node2);
@@ -4966,21 +4966,21 @@ void tst_TestCore::testInstancesPropertyChangeTargets()
 
 void tst_TestCore::testInstancesDeletePropertyChanges()
 {
-    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 1, 1));
         QVERIFY(model.data());
         QScopedPointer<TestView> view(new TestView(model.data()));
         QVERIFY(view.data());
         model->attachView(view.data());
 
-        ModelNode node1 = view->createModelNode("QtQuick.Item", 4, 7);
+        ModelNode node1 = view->createModelNode("QtQuick.Item", 1, 1);
         node1.setId("node1");
 
         view->rootModelNode().nodeListProperty("children").reparentHere(node1);
 
-        ModelNode node2 = view->createModelNode("QtQuick.Rectangle", 4, 7);
+        ModelNode node2 = view->createModelNode("QtQuick.Rectangle", 1, 1);
         node2.setId("node2");
 
-        ModelNode node3 = view->createModelNode("QtQuick.Rectangle", 4, 7);
+        ModelNode node3 = view->createModelNode("QtQuick.Rectangle", 1, 1);
         node3.setId("node3");
 
         node1.nodeListProperty("children").reparentHere(node2);
@@ -5055,7 +5055,7 @@ void tst_TestCore::testInstancesDeletePropertyChanges()
 
 void tst_TestCore::testInstancesChildrenLowLevel()
 {
-//    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 4, 7));
+//    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 1, 1));
 //    QVERIFY(model.data());
 
 //    QScopedPointer<NodeInstanceView> view(new NodeInstanceView);
@@ -5067,11 +5067,11 @@ void tst_TestCore::testInstancesChildrenLowLevel()
 
 //    rootModelNode.setId("rootModelNode");
 
-//    ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Text", 4, 7, "data");
+//    ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Text", 1, 1, "data");
 //    QVERIFY(childNode1.isValid());
 //    childNode1.setId("childNode1");
 
-//    ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.TextEdit", 4, 7, "data");
+//    ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.TextEdit", 1, 1, "data");
 //    QVERIFY(childNode2.isValid());
 //    childNode2.setId("childNode2");
 
@@ -5145,7 +5145,7 @@ void tst_TestCore::testInstancesChildrenLowLevel()
 
 void tst_TestCore::testInstancesResourcesLowLevel()
 {
-//    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 4, 7));
+//    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 1, 1));
 //    QVERIFY(model.data());
 
 //    QScopedPointer<NodeInstanceView> view(new NodeInstanceView);
@@ -5157,15 +5157,15 @@ void tst_TestCore::testInstancesResourcesLowLevel()
 
 //    rootModelNode.setId("rootModelNode");
 
-//    ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Text", 4, 7, "data");
+//    ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Text", 1, 1, "data");
 //    QVERIFY(childNode1.isValid());
 //    childNode1.setId("childNode1");
 
-//    ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.TextEdit", 4, 7, "data");
+//    ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.TextEdit", 1, 1, "data");
 //    QVERIFY(childNode2.isValid());
 //    childNode2.setId("childNode2");
 
-//    ModelNode listModel = addNodeListChild(rootModelNode, "QtQuick.ListModel", 4, 7, "data");
+//    ModelNode listModel = addNodeListChild(rootModelNode, "QtQuick.ListModel", 1, 1, "data");
 //    QVERIFY(listModel.isValid());
 //    listModel.setId("listModel");
 
@@ -5244,7 +5244,7 @@ void tst_TestCore::testInstancesResourcesLowLevel()
 //    QCOMPARE(listReferenceData.at(1), child1Item);
 //    QCOMPARE(listReferenceData.at(2), child2Item);
 
-//    ModelNode listModel2 = addNodeListChild(rootModelNode, "QtQuick.ListModel", 4, 7, "data");
+//    ModelNode listModel2 = addNodeListChild(rootModelNode, "QtQuick.ListModel", 1, 1, "data");
 //    QVERIFY(listModel2.isValid());
 //    listModel2.setId("listModel2");
 
@@ -5292,7 +5292,7 @@ void tst_TestCore::testInstancesResourcesLowLevel()
 
 void tst_TestCore::testInstancesFlickableLowLevel()
 {
-//    QScopedPointer<Model> model(Model::create("QtQuick.Flickable", 4, 7));
+//    QScopedPointer<Model> model(Model::create("QtQuick.Flickable", 1, 1));
 //    QVERIFY(model.data());
 
 //    QScopedPointer<NodeInstanceView> view(new NodeInstanceView);
@@ -5304,15 +5304,15 @@ void tst_TestCore::testInstancesFlickableLowLevel()
 
 //    rootModelNode.setId("rootModelNode");
 
-//    ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Text", 4, 7, "flickableData");
+//    ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Text", 1, 1, "flickableData");
 //    QVERIFY(childNode1.isValid());
 //    childNode1.setId("childNode1");
 
-//    ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.TextEdit", 4, 7, "flickableData");
+//    ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.TextEdit", 1, 1, "flickableData");
 //    QVERIFY(childNode2.isValid());
 //    childNode2.setId("childNode2");
 
-//    ModelNode listModel = addNodeListChild(rootModelNode, "QtQuick.ListModel", 4, 7, "flickableData");
+//    ModelNode listModel = addNodeListChild(rootModelNode, "QtQuick.ListModel", 1, 1, "flickableData");
 //    QVERIFY(listModel.isValid());
 //    listModel.setId("listModel");
 
@@ -5380,7 +5380,7 @@ void tst_TestCore::testInstancesFlickableLowLevel()
 
 void tst_TestCore::testInstancesReorderChildrenLowLevel()
 {
-//    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 4, 7));
+//    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 1, 1));
 //    QVERIFY(model.data());
 
 //    QScopedPointer<NodeInstanceView> view(new NodeInstanceView);
@@ -5392,23 +5392,23 @@ void tst_TestCore::testInstancesReorderChildrenLowLevel()
 
 //    rootModelNode.setId("rootModelNode");
 
-//    ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Text", 4, 7, "data");
+//    ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick.Text", 1, 1, "data");
 //    QVERIFY(childNode1.isValid());
 //    childNode1.setId("childNode1");
 
-//    ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.TextEdit", 4, 7, "data");
+//    ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick.TextEdit", 1, 1, "data");
 //    QVERIFY(childNode2.isValid());
 //    childNode2.setId("childNode2");
 
-//    ModelNode listModel = addNodeListChild(rootModelNode, "QtQuick.ListModel", 4, 7, "data");
+//    ModelNode listModel = addNodeListChild(rootModelNode, "QtQuick.ListModel", 1, 1, "data");
 //    QVERIFY(listModel.isValid());
 //    listModel.setId("listModel");
 
-//    ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick.TextEdit", 4, 7, "data");
+//    ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick.TextEdit", 1, 1, "data");
 //    QVERIFY(childNode3.isValid());
 //    childNode3.setId("childNode3");
 
-//    ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick.TextEdit", 4, 7, "data");
+//    ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick.TextEdit", 1, 1, "data");
 //    QVERIFY(childNode4.isValid());
 //    childNode4.setId("childNode4");
 
@@ -5479,7 +5479,7 @@ void tst_TestCore::testInstancesReorderChildrenLowLevel()
 
 void tst_TestCore::testQmlModelStatesInvalidForRemovedNodes()
 {
-    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -5496,11 +5496,11 @@ void tst_TestCore::testQmlModelStatesInvalidForRemovedNodes()
     QVERIFY(state1.isValid());
     QCOMPARE(state1.name(), QString("state1"));
 
-    ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
     QVERIFY(childNode.isValid());
     childNode.setId("childNode");
 
-    ModelNode subChildNode = addNodeListChild(childNode, "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode subChildNode = addNodeListChild(childNode, "QtQuick.Rectangle", 1, 1, "data");
     QVERIFY(subChildNode.isValid());
     subChildNode.setId("subChildNode");
 
@@ -5520,7 +5520,7 @@ void tst_TestCore::testInstancesAttachToExistingModel()
     // Test attaching nodeinstanceview to an existing model
     //
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -5528,7 +5528,7 @@ void tst_TestCore::testInstancesAttachToExistingModel()
     model->attachView(view.data());
 
     ModelNode rootNode = view->rootModelNode();
-    ModelNode rectangleNode = addNodeListChild(rootNode, "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode rectangleNode = addNodeListChild(rootNode, "QtQuick.Rectangle", 1, 1, "data");
 
     rectangleNode.variantProperty("width").setValue(100);
 
@@ -5552,7 +5552,7 @@ void tst_TestCore::testInstancesAttachToExistingModel()
 
 void tst_TestCore::testQmlModelAddMultipleStates()
 {
-    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -5583,7 +5583,7 @@ void tst_TestCore::testQmlModelAddMultipleStates()
 
 void tst_TestCore::testQmlModelRemoveStates()
 {
-    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Rectangle", 1, 1));
 
     QScopedPointer<TestView> view(new TestView(model.data()));
     QVERIFY(view.data());
@@ -5688,12 +5688,12 @@ void tst_TestCore::defaultPropertyValues()
     QCOMPARE(view->rootModelNode().variantProperty("x").value().toDouble(), 0.0);
     QCOMPARE(view->rootModelNode().variantProperty("width").value().toDouble(), 0.0);
 
-    ModelNode rectNode(addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 4, 7, "data"));
+    ModelNode rectNode(addNodeListChild(view->rootModelNode(), "QtQuick.Rectangle", 1, 1, "data"));
 
     QCOMPARE(rectNode.variantProperty("y").value().toDouble(), 0.0);
     QCOMPARE(rectNode.variantProperty("width").value().toDouble(), 0.0);
 
-    ModelNode imageNode(addNodeListChild(view->rootModelNode(), "QtQuick.Image", 4, 7, "data"));
+    ModelNode imageNode(addNodeListChild(view->rootModelNode(), "QtQuick.Image", 1, 1, "data"));
 
     QCOMPARE(imageNode.variantProperty("y").value().toDouble(), 0.0);
     QCOMPARE(imageNode.variantProperty("width").value().toDouble(), 0.0);
@@ -5731,9 +5731,9 @@ void tst_TestCore::testModelNodeInHierarchy()
     model->attachView(view.data());
 
     QVERIFY(view->rootModelNode().isInHierarchy());
-    ModelNode node1 = addNodeListChild(view->rootModelNode(), "QtQuick.Item", 4, 7, "data");
+    ModelNode node1 = addNodeListChild(view->rootModelNode(), "QtQuick.Item", 1, 1, "data");
     QVERIFY(node1.isInHierarchy());
-    ModelNode node2 = view->createModelNode("QtQuick.Item", 4, 7);
+    ModelNode node2 = view->createModelNode("QtQuick.Item", 1, 1);
     QVERIFY(!node2.isInHierarchy());
     node2.nodeListProperty("data").reparentHere(node1);
     QVERIFY(!node2.isInHierarchy());
@@ -5766,11 +5766,11 @@ void tst_TestCore::testModelNodeIsAncestorOf()
     model->attachView(view.data());
 
     view->rootModelNode().setId("item1");
-    ModelNode item2 = addNodeListChild(view->rootModelNode(), "QtQuick.Item", 4, 7, "data");
+    ModelNode item2 = addNodeListChild(view->rootModelNode(), "QtQuick.Item", 1, 1, "data");
     item2.setId("item2");
-    ModelNode item3 = addNodeListChild(view->rootModelNode(), "QtQuick.Item", 4, 7, "data");
+    ModelNode item3 = addNodeListChild(view->rootModelNode(), "QtQuick.Item", 1, 1, "data");
     item3.setId("item3");
-    ModelNode item4 = addNodeListChild(item3, "QtQuick.Item", 4, 7, "data");
+    ModelNode item4 = addNodeListChild(item3, "QtQuick.Item", 1, 1, "data");
     item4.setId("item4");
 
     QVERIFY(view->rootModelNode().isAncestorOf(item2));
@@ -6104,7 +6104,7 @@ void tst_TestCore::removeFillAnchorByChanging()
 
 void tst_TestCore::testModelBindings()
 {
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data(), NodeInstanceServerInterface::TestModus);
@@ -6124,7 +6124,7 @@ void tst_TestCore::testModelBindings()
     QCOMPARE(rootInstance.size().width(), 200.0);
     QCOMPARE(rootInstance.size().height(), 100.0);
 
-    ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
 
     childNode.variantProperty("width") = 100;
     childNode.variantProperty("height") = 100;
@@ -6162,7 +6162,7 @@ void tst_TestCore::testModelBindings()
 
 void tst_TestCore::testModelDynamicProperties()
 {
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     TestView *testView = new TestView(model.data());
@@ -6215,10 +6215,10 @@ void tst_TestCore::testModelSliding()
 
     ModelNode rootModelNode(view->rootModelNode());
 
-    ModelNode rect00(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data"));
-    ModelNode rect01(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data"));
-    ModelNode rect02(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data"));
-    ModelNode rect03(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data"));
+    ModelNode rect00(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data"));
+    ModelNode rect01(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data"));
+    ModelNode rect02(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data"));
+    ModelNode rect03(addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data"));
 
     QVERIFY(rect00.isValid());
     QVERIFY(rect01.isValid());
@@ -6305,7 +6305,7 @@ void tst_TestCore::testRewriterChangeId()
     QCOMPARE(textEdit.toPlainText(), expected);
 
     // change id for node outside of hierarchy
-    ModelNode node = view->createModelNode("QtQuick.Item", 4, 7);
+    ModelNode node = view->createModelNode("QtQuick.Item", 1, 1);
     node.setId("myId");
 }
 
@@ -6372,7 +6372,7 @@ void tst_TestCore::testRewriterChangeValueProperty()
     // change property for node outside of hierarchy
     PropertyListType properties;
     properties.append(QPair<QString,QVariant>("x", 10));
-    ModelNode node = view->createModelNode("QtQuick.Item", 4, 7, properties);
+    ModelNode node = view->createModelNode("QtQuick.Item", 1, 1, properties);
     node.variantProperty("x").setValue(20);
 }
 
@@ -6419,7 +6419,7 @@ void tst_TestCore::testRewriterRemoveValueProperty()
     // remove property for node outside of hierarchy
     PropertyListType properties;
     properties.append(QPair<QString,QVariant>("x", 10));
-    ModelNode node = view->createModelNode("QtQuick.Item", 4, 7, properties);
+    ModelNode node = view->createModelNode("QtQuick.Item", 1, 1, properties);
     node.removeProperty("x");
 }
 
@@ -6473,7 +6473,7 @@ void tst_TestCore::testRewriterObjectTypeProperty()
 
     QCOMPARE(rootModelNode.type(), QLatin1String("QtQuick.Rectangle"));
 
-    view->changeRootNodeType(QLatin1String("QtQuick.Text"), 4, 7);
+    view->changeRootNodeType(QLatin1String("QtQuick.Text"), 1, 1);
 
     QCOMPARE(rootModelNode.type(), QLatin1String("QtQuick.Text"));
 }
@@ -6505,7 +6505,7 @@ void tst_TestCore::testRewriterPropertyChanges()
         textEdit.setPlainText(qmlString);
         NotIndentingTextEditModifier textModifier(&textEdit);
 
-        QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+        QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
         QVERIFY(model.data());
 
         QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6562,7 +6562,7 @@ void tst_TestCore::testRewriterListModel()
         textEdit.setPlainText(qmlString);
         NotIndentingTextEditModifier textModifier(&textEdit);
 
-        QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+        QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
         QVERIFY(model.data());
 
         QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -6599,7 +6599,7 @@ void tst_TestCore::testRewriterAddProperty()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6643,7 +6643,7 @@ void tst_TestCore::testRewriterAddPropertyInNestedObject()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6689,7 +6689,7 @@ void tst_TestCore::testRewriterAddObjectDefinition()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6704,7 +6704,7 @@ void tst_TestCore::testRewriterAddObjectDefinition()
     QVERIFY(rootNode.isValid());
     QCOMPARE(rootNode.type(), QString("QtQuick.Rectangle"));
 
-    ModelNode childNode = view->createModelNode("QtQuick.MouseArea", 4, 7);
+    ModelNode childNode = view->createModelNode("QtQuick.MouseArea", 1, 1);
     rootNode.nodeAbstractProperty(QLatin1String("data")).reparentHere(childNode);
 
     QCOMPARE(rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().size(), 1);
@@ -6723,7 +6723,7 @@ void tst_TestCore::testRewriterAddStatesArray()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6737,7 +6737,7 @@ void tst_TestCore::testRewriterAddStatesArray()
     QVERIFY(rootNode.isValid());
     QCOMPARE(rootNode.type(), QString("QtQuick.Rectangle"));
 
-    ModelNode stateNode = view->createModelNode("QtQuick.State", 4, 7);
+    ModelNode stateNode = view->createModelNode("QtQuick.State", 1, 1);
     rootNode.nodeListProperty(QLatin1String("states")).reparentHere(stateNode);
 
     const QString expected1 = QLatin1String("\n"
@@ -6751,7 +6751,7 @@ void tst_TestCore::testRewriterAddStatesArray()
                                            "}");
     QCOMPARE(textEdit.toPlainText(), expected1);
 
-    ModelNode stateNode2 = view->createModelNode("QtQuick.State", 4, 7);
+    ModelNode stateNode2 = view->createModelNode("QtQuick.State", 1, 1);
     rootNode.nodeListProperty(QLatin1String("states")).reparentHere(stateNode2);
 
     const QString expected2 = QLatin1String("\n"
@@ -6785,7 +6785,7 @@ void tst_TestCore::testRewriterRemoveStates()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6843,7 +6843,7 @@ void tst_TestCore::testRewriterRemoveObjectDefinition()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6881,9 +6881,9 @@ void tst_TestCore::testRewriterRemoveObjectDefinition()
     QCOMPARE(textEdit.toPlainText(), expected);
 
     // don't crash when deleting nodes not in any hierarchy
-    ModelNode node1 = view->createModelNode("QtQuick.Rectangle", 4, 7);
-    ModelNode node2 = addNodeListChild(node1, "QtQuick.Item", 4, 7, "data");
-    ModelNode node3 = addNodeListChild(node2, "QtQuick.Item", 4, 7, "data");
+    ModelNode node1 = view->createModelNode("QtQuick.Rectangle", 1, 1);
+    ModelNode node2 = addNodeListChild(node1, "QtQuick.Item", 1, 1, "data");
+    ModelNode node3 = addNodeListChild(node2, "QtQuick.Item", 1, 1, "data");
 
     node3.destroy();
     node1.destroy();
@@ -6902,7 +6902,7 @@ void tst_TestCore::testRewriterRemoveScriptBinding()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6955,7 +6955,7 @@ void tst_TestCore::testRewriterNodeReparenting()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6996,9 +6996,9 @@ void tst_TestCore::testRewriterNodeReparenting()
     QCOMPARE(textEdit.toPlainText(), expected);
 
     // reparenting outside of the hierarchy
-    ModelNode node1 = view->createModelNode("QtQuick.Rectangle", 4, 7);
-    ModelNode node2 = view->createModelNode("QtQuick.Item", 4, 7);
-    ModelNode node3 = view->createModelNode("QtQuick.Item", 4, 7);
+    ModelNode node1 = view->createModelNode("QtQuick.Rectangle", 1, 1);
+    ModelNode node2 = view->createModelNode("QtQuick.Item", 1, 1);
+    ModelNode node3 = view->createModelNode("QtQuick.Item", 1, 1);
     node2.nodeListProperty("data").reparentHere(node3);
     node1.nodeListProperty("data").reparentHere(node2);
 
@@ -7026,7 +7026,7 @@ void tst_TestCore::testRewriterNodeReparenting()
     QCOMPARE(textEdit.toPlainText(), expected);
 
     // reparent out of the hierarchy
-    ModelNode node4 = view->createModelNode("QtQuick.Rectangle", 4, 7);
+    ModelNode node4 = view->createModelNode("QtQuick.Rectangle", 1, 1);
     node4.nodeListProperty("data").reparentHere(node1);
 
     expected =  "\n"
@@ -7063,7 +7063,7 @@ void tst_TestCore::testRewriterNodeReparentingWithTransaction()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -7124,7 +7124,7 @@ void tst_TestCore::testRewriterMovingInOut()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -7139,7 +7139,7 @@ void tst_TestCore::testRewriterMovingInOut()
     QVERIFY(rootNode.isValid());
     QCOMPARE(rootNode.type(), QString("QtQuick.Rectangle"));
 
-    ModelNode newNode = view->createModelNode("QtQuick.MouseArea", 4, 7);
+    ModelNode newNode = view->createModelNode("QtQuick.MouseArea", 1, 1);
     rootNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
 
     const QLatin1String expected1("\n"
@@ -7180,7 +7180,7 @@ void tst_TestCore::testRewriterMovingInOutWithTransaction()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -7197,7 +7197,7 @@ void tst_TestCore::testRewriterMovingInOutWithTransaction()
 
     RewriterTransaction transaction = view->beginRewriterTransaction();
 
-    ModelNode newNode = view->createModelNode("QtQuick.MouseArea", 4, 7);
+    ModelNode newNode = view->createModelNode("QtQuick.MouseArea", 1, 1);
     rootNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
 
 #define move(node, x, y) {\
@@ -7233,7 +7233,7 @@ void tst_TestCore::testRewriterComplexMovingInOut()
     textEdit.setPlainText(qmlString);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestView> view(new TestView(model.data()));
@@ -7249,7 +7249,7 @@ void tst_TestCore::testRewriterComplexMovingInOut()
     QCOMPARE(rootNode.type(), QString("QtQuick.Rectangle"));
     ModelNode itemNode = rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0);
 
-    ModelNode newNode = view->createModelNode("QtQuick.MouseArea", 4, 7);
+    ModelNode newNode = view->createModelNode("QtQuick.MouseArea", 1, 1);
     rootNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
 
     const QLatin1String expected1("\n"
@@ -7384,7 +7384,7 @@ void tst_TestCore::changePropertyBinding()
     ModelNode rootModelNode(view->rootModelNode());
     rootModelNode.variantProperty("width") = 20;
 
-    ModelNode firstChild = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 4, 7, "data");
+    ModelNode firstChild = addNodeListChild(rootModelNode, "QtQuick.Rectangle", 1, 1, "data");
     firstChild.bindingProperty("width").setExpression(QString("parent.width"));
     firstChild.variantProperty("height")=  10;
     QVERIFY(firstChild.isValid());
@@ -7424,7 +7424,7 @@ void tst_TestCore::loadTestFiles()
         textEdit.setPlainText(QString(file.readAll()));
         NotIndentingTextEditModifier textModifier(&textEdit);
 
-        QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+        QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
         QVERIFY(model.data());
 
         QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7447,7 +7447,7 @@ void tst_TestCore::loadTestFiles()
         textEdit.setPlainText(QString(file.readAll()));
         NotIndentingTextEditModifier textModifier(&textEdit);
 
-        QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+        QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
         QVERIFY(model.data());
 
         QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7477,7 +7477,7 @@ void tst_TestCore::loadTestFiles()
         textEdit.setPlainText(QString(file.readAll()));
         NotIndentingTextEditModifier textModifier(&textEdit);
 
-        QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+        QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
         QVERIFY(model.data());
 
         QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7526,7 +7526,7 @@ void tst_TestCore::loadTestFiles()
         textEdit.setPlainText(QString(file.readAll()));
         NotIndentingTextEditModifier textModifier(&textEdit);
 
-        QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+        QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
         QVERIFY(model.data());
 
         QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7563,7 +7563,7 @@ void tst_TestCore::loadGradient()
     textEdit.setPlainText(rectWithGradient);
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
     QVERIFY(model.data());
 
     QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7659,7 +7659,7 @@ void tst_TestCore::changeGradientId()
         textEdit.setPlainText(rectWithGradient);
         NotIndentingTextEditModifier textModifier(&textEdit);
 
-        QScopedPointer<Model> model(Model::create("QtQuick.Item", 4, 7));
+        QScopedPointer<Model> model(Model::create("QtQuick.Item", 1, 1));
         QVERIFY(model.data());
 
         QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7692,7 +7692,7 @@ void tst_TestCore::changeGradientId()
         firstStop.destroy();
         QVERIFY(!firstStop.isValid());
 
-        ModelNode gradientStop  = addNodeListChild(gradientNode, "QtQuick.GradientStop", 4, 7, "stops");
+        ModelNode gradientStop  = addNodeListChild(gradientNode, "QtQuick.GradientStop", 1, 1, "stops");
         gradientStop.variantProperty("position") = 0.5;
         gradientStop.variantProperty("color") = QColor("yellow");