summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/declarative/qmlcomponent
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-08-03 05:09:56 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-08-03 05:09:56 (GMT)
commit953078ed630dd7e3dae568bf003950bda98d8f47 (patch)
tree4b8300ffeebff96746bf56e6cdcbe4b33b4fc7c8 /tests/benchmarks/declarative/qmlcomponent
parent651b7aa72052faa90b3a268f00f82d56460166d3 (diff)
downloadQt-953078ed630dd7e3dae568bf003950bda98d8f47.zip
Qt-953078ed630dd7e3dae568bf003950bda98d8f47.tar.gz
Qt-953078ed630dd7e3dae568bf003950bda98d8f47.tar.bz2
Make QmlMetaProperty reentrant
Diffstat (limited to 'tests/benchmarks/declarative/qmlcomponent')
-rw-r--r--tests/benchmarks/declarative/qmlcomponent/myqmlobject.txt2
-rw-r--r--tests/benchmarks/declarative/qmlcomponent/myqmlobject_binding.txt2
-rw-r--r--tests/benchmarks/declarative/qmlcomponent/object.txt2
-rw-r--r--tests/benchmarks/declarative/qmlcomponent/synthesized_properties.2.txt2
-rw-r--r--tests/benchmarks/declarative/qmlcomponent/synthesized_properties.txt2
-rw-r--r--tests/benchmarks/declarative/qmlcomponent/testtypes.cpp2
6 files changed, 11 insertions, 1 deletions
diff --git a/tests/benchmarks/declarative/qmlcomponent/myqmlobject.txt b/tests/benchmarks/declarative/qmlcomponent/myqmlobject.txt
index 05ed87a..9c3f7f8 100644
--- a/tests/benchmarks/declarative/qmlcomponent/myqmlobject.txt
+++ b/tests/benchmarks/declarative/qmlcomponent/myqmlobject.txt
@@ -1 +1,3 @@
+import Qt.test 4.6
+
MyQmlObject {}
diff --git a/tests/benchmarks/declarative/qmlcomponent/myqmlobject_binding.txt b/tests/benchmarks/declarative/qmlcomponent/myqmlobject_binding.txt
index 4dfa7c3..e6cc4cf 100644
--- a/tests/benchmarks/declarative/qmlcomponent/myqmlobject_binding.txt
+++ b/tests/benchmarks/declarative/qmlcomponent/myqmlobject_binding.txt
@@ -1,3 +1,5 @@
+import Qt.test 4.6
+
MyQmlObject {
result: value
}
diff --git a/tests/benchmarks/declarative/qmlcomponent/object.txt b/tests/benchmarks/declarative/qmlcomponent/object.txt
index 7dc75192..85e74b9 100644
--- a/tests/benchmarks/declarative/qmlcomponent/object.txt
+++ b/tests/benchmarks/declarative/qmlcomponent/object.txt
@@ -1 +1,3 @@
+import Qt 4.6
+
Object {}
diff --git a/tests/benchmarks/declarative/qmlcomponent/synthesized_properties.2.txt b/tests/benchmarks/declarative/qmlcomponent/synthesized_properties.2.txt
index d59104d..90db37c 100644
--- a/tests/benchmarks/declarative/qmlcomponent/synthesized_properties.2.txt
+++ b/tests/benchmarks/declarative/qmlcomponent/synthesized_properties.2.txt
@@ -1,3 +1,5 @@
+import Qt 4.6
+
Object {
property int a
property bool b
diff --git a/tests/benchmarks/declarative/qmlcomponent/synthesized_properties.txt b/tests/benchmarks/declarative/qmlcomponent/synthesized_properties.txt
index d9eb708..bb5469a 100644
--- a/tests/benchmarks/declarative/qmlcomponent/synthesized_properties.txt
+++ b/tests/benchmarks/declarative/qmlcomponent/synthesized_properties.txt
@@ -1,3 +1,5 @@
+import Qt 4.6
+
Object {
property int a
}
diff --git a/tests/benchmarks/declarative/qmlcomponent/testtypes.cpp b/tests/benchmarks/declarative/qmlcomponent/testtypes.cpp
index 60e69e2..5021bf3 100644
--- a/tests/benchmarks/declarative/qmlcomponent/testtypes.cpp
+++ b/tests/benchmarks/declarative/qmlcomponent/testtypes.cpp
@@ -1,3 +1,3 @@
#include "testtypes.h"
-QML_DEFINE_TYPE(MyQmlObject, MyQmlObject);
+QML_DEFINE_TYPE(Qt/test, 4, 6, 6, MyQmlObject, MyQmlObject);