Improve performance by separating id and context properties

3 files changed, 10 insertions, 5 deletions

diff --git a/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp b/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp
index 8d3c0b4..01cb54b 100644
--- a/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp
+++ b/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp
@@ -276,11 +276,6 @@ void tst_qmlbindengine::contextPropertiesTriggerReeval()
         MyExpression expr(&context, "testObj2");
         QCOMPARE(expr.changed, false);
         QCOMPARE(expr.value(), QVariant::fromValue((QObject *)object3));
-
-        delete object3;
-
-        QCOMPARE(expr.changed, true);
-        QCOMPARE(expr.value(), QVariant());
     }
 
 }
diff --git a/tests/benchmarks/declarative/qmlcomponent/object_id.txt b/tests/benchmarks/declarative/qmlcomponent/object_id.txt
new file mode 100644
index 0000000..526b6ad
--- /dev/null
+++ b/tests/benchmarks/declarative/qmlcomponent/object_id.txt
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+Object {
+    id: Blah
+}
+
diff --git a/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp b/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp
index f032004..f0e029d 100644
--- a/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp
+++ b/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp
@@ -56,6 +56,7 @@ void tst_qmlcomponent::creation_data()
     QTest::addColumn<QString>("file");
 
     QTest::newRow("Object") << "object.txt";
+    QTest::newRow("Object - Id") << "object_id.txt";
     QTest::newRow("MyQmlObject") << "myqmlobject.txt";
     QTest::newRow("MyQmlObject: basic binding") << "myqmlobject_binding.txt";
     QTest::newRow("Synthesized properties") << "synthesized_properties.txt";
@@ -70,6 +71,9 @@ void tst_qmlcomponent::creation()
     QmlComponent c(&engine, file);
     QVERIFY(c.isReady());
 
+    QObject *obj = c.create();
+    delete obj;
+
     QBENCHMARK {
         QObject *obj = c.create();
         delete obj;