From 0a52765f1c7fbd7d5286bcaab32cff35feb89a95 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Wed, 17 Mar 2010 15:59:46 +1000
Subject: Compile

---
 tests/benchmarks/declarative/binding/testtypes.cpp          |  2 +-
 tests/benchmarks/declarative/declarative.pro                |  3 ++-
 tests/benchmarks/declarative/painting/paintbenchmark.pro    | 13 -------------
 tests/benchmarks/declarative/painting/painting.pro          | 13 +++++++++++++
 .../declarative/qdeclarativecomponent/testtypes.cpp         |  2 +-
 .../declarative/qdeclarativetime/qdeclarativetime.cpp       |  2 +-
 tests/benchmarks/declarative/script/tst_script.cpp          |  2 +-
 7 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 tests/benchmarks/declarative/painting/paintbenchmark.pro
 create mode 100644 tests/benchmarks/declarative/painting/painting.pro

diff --git a/tests/benchmarks/declarative/binding/testtypes.cpp b/tests/benchmarks/declarative/binding/testtypes.cpp
index 043c8ab..1fc9ccd 100644
--- a/tests/benchmarks/declarative/binding/testtypes.cpp
+++ b/tests/benchmarks/declarative/binding/testtypes.cpp
@@ -42,5 +42,5 @@
 
 void registerTypes()
 {
-    QML_REGISTER_TYPE(Test, 1, 0, MyQmlObject, MyQmlObject);
+    qmlRegisterType<MyQmlObject>("Test", 1, 0, "MyQmlObject");
 }
diff --git a/tests/benchmarks/declarative/declarative.pro b/tests/benchmarks/declarative/declarative.pro
index 8c0ed42..38ea6c4 100644
--- a/tests/benchmarks/declarative/declarative.pro
+++ b/tests/benchmarks/declarative/declarative.pro
@@ -2,9 +2,10 @@ TEMPLATE = subdirs
 SUBDIRS += \
            binding \
            creation \
+           painting \
            pointers \
            qdeclarativecomponent \
            qdeclarativeimage \
            qdeclarativemetaproperty \
            script \
-#           qdeclarativetime
+           qdeclarativetime
diff --git a/tests/benchmarks/declarative/painting/paintbenchmark.pro b/tests/benchmarks/declarative/painting/paintbenchmark.pro
deleted file mode 100644
index 2f98e8b..0000000
--- a/tests/benchmarks/declarative/painting/paintbenchmark.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) fr 29. jan 13:57:52 2010
-######################################################################
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += paintbenchmark.cpp
-QT += opengl
-CONFIG += console
diff --git a/tests/benchmarks/declarative/painting/painting.pro b/tests/benchmarks/declarative/painting/painting.pro
new file mode 100644
index 0000000..2f98e8b
--- /dev/null
+++ b/tests/benchmarks/declarative/painting/painting.pro
@@ -0,0 +1,13 @@
+######################################################################
+# Automatically generated by qmake (2.01a) fr 29. jan 13:57:52 2010
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += paintbenchmark.cpp
+QT += opengl
+CONFIG += console
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp b/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp
index acdc395..7bc6ca2 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp
@@ -42,5 +42,5 @@
 
 void registerTypes()
 {
-    QML_REGISTER_TYPE(Qt.test, 4, 6, MyQmlObject, MyQmlObject);
+    qmlRegisterType<MyQmlObject>("Qt.test", 4, 6, "MyQmlObject");
 }
diff --git a/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp b/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp
index a924337..20f0d93d 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp
+++ b/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp
@@ -156,7 +156,7 @@ int main(int argc, char ** argv)
 {
     QApplication app(argc, argv);
 
-    QML_REGISTER_TYPE(QDeclarativeTime, 1, 0, Timer, Timer);
+    qmlRegisterType<Timer>("QDeclarativeTime", 1, 0, "Timer");
 
     uint iterations = 1024;
     QString filename;
diff --git a/tests/benchmarks/declarative/script/tst_script.cpp b/tests/benchmarks/declarative/script/tst_script.cpp
index 9dd4076..8ea6dcd 100644
--- a/tests/benchmarks/declarative/script/tst_script.cpp
+++ b/tests/benchmarks/declarative/script/tst_script.cpp
@@ -144,7 +144,7 @@ int TestObject::x()
 
 void tst_script::initTestCase()
 {
-    QML_REGISTER_TYPE(Qt.test, 1, 0, TestObject, TestObject);
+    qmlRegisterType<TestObject>("Qt.test", 1, 0, "TestObject");
 }
 
 
-- 
cgit v0.12