Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.

Task-number: QT-2798

8 files changed, 31 insertions, 12 deletions

diff --git a/tests/benchmarks/declarative/binding/testtypes.cpp b/tests/benchmarks/declarative/binding/testtypes.cpp
index 3a9f59b..043c8ab 100644
--- a/tests/benchmarks/declarative/binding/testtypes.cpp
+++ b/tests/benchmarks/declarative/binding/testtypes.cpp
@@ -40,4 +40,7 @@
 ****************************************************************************/
 #include "testtypes.h"
 
-QML_DEFINE_TYPE(Test, 1, 0, MyQmlObject, MyQmlObject);
+void registerTypes()
+{
+    QML_REGISTER_TYPE(Test, 1, 0, MyQmlObject, MyQmlObject);
+}
diff --git a/tests/benchmarks/declarative/binding/testtypes.h b/tests/benchmarks/declarative/binding/testtypes.h
index d4e0a1a..a4f16d0 100644
--- a/tests/benchmarks/declarative/binding/testtypes.h
+++ b/tests/benchmarks/declarative/binding/testtypes.h
@@ -78,4 +78,6 @@ private:
 };
 QML_DECLARE_TYPE(MyQmlObject);
 
+void registerTypes();
+
 #endif // TESTTYPES_H
diff --git a/tests/benchmarks/declarative/binding/tst_binding.cpp b/tests/benchmarks/declarative/binding/tst_binding.cpp
index 74a3407..8fae924 100644
--- a/tests/benchmarks/declarative/binding/tst_binding.cpp
+++ b/tests/benchmarks/declarative/binding/tst_binding.cpp
@@ -57,8 +57,8 @@ public:
     virtual ~tst_binding();
 
 public slots:
-    void init();
-    void cleanup();
+    void initTestCase();
+    void cleanupTestCase();
 
 private slots:
     void objectproperty_data();
@@ -78,11 +78,12 @@ tst_binding::~tst_binding()
 {
 }
 
-void tst_binding::init()
+void tst_binding::initTestCase()
 {
+    registerTypes();
 }
 
-void tst_binding::cleanup()
+void tst_binding::cleanupTestCase()
 {
 }
 
diff --git a/tests/benchmarks/declarative/qmlcomponent/testtypes.cpp b/tests/benchmarks/declarative/qmlcomponent/testtypes.cpp
index f0bc1f9..acdc395 100644
--- a/tests/benchmarks/declarative/qmlcomponent/testtypes.cpp
+++ b/tests/benchmarks/declarative/qmlcomponent/testtypes.cpp
@@ -40,4 +40,7 @@
 ****************************************************************************/
 #include "testtypes.h"
 
-QML_DEFINE_TYPE(Qt.test, 4, 6, MyQmlObject, MyQmlObject);
+void registerTypes()
+{
+    QML_REGISTER_TYPE(Qt.test, 4, 6, MyQmlObject, MyQmlObject);
+}
diff --git a/tests/benchmarks/declarative/qmlcomponent/testtypes.h b/tests/benchmarks/declarative/qmlcomponent/testtypes.h
index d4e0a1a..a4f16d0 100644
--- a/tests/benchmarks/declarative/qmlcomponent/testtypes.h
+++ b/tests/benchmarks/declarative/qmlcomponent/testtypes.h
@@ -78,4 +78,6 @@ private:
 };
 QML_DECLARE_TYPE(MyQmlObject);
 
+void registerTypes();
+
 #endif // TESTTYPES_H
diff --git a/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp b/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp
index 647edbf..afd1cdf 100644
--- a/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp
+++ b/tests/benchmarks/declarative/qmlcomponent/tst_qmlcomponent.cpp
@@ -58,8 +58,8 @@ public:
     virtual ~tst_qmlcomponent();
 
 public slots:
-    void init();
-    void cleanup();
+    void initTestCase();
+    void cleanupTestCase();
 
 private slots:
     void creation_data();
@@ -77,11 +77,12 @@ tst_qmlcomponent::~tst_qmlcomponent()
 {
 }
 
-void tst_qmlcomponent::init()
+void tst_qmlcomponent::initTestCase()
 {
+    registerTypes();
 }
 
-void tst_qmlcomponent::cleanup()
+void tst_qmlcomponent::cleanupTestCase()
 {
 }
 
diff --git a/tests/benchmarks/declarative/qmltime/qmltime.cpp b/tests/benchmarks/declarative/qmltime/qmltime.cpp
index 2cc5d0d..cbac422 100644
--- a/tests/benchmarks/declarative/qmltime/qmltime.cpp
+++ b/tests/benchmarks/declarative/qmltime/qmltime.cpp
@@ -76,7 +76,6 @@ private:
     QGraphicsRectItem m_item;
 };
 QML_DECLARE_TYPE(Timer);
-QML_DEFINE_TYPE(QmlTime, 1, 0, Timer, Timer);
 
 Timer *Timer::m_timer = 0;
 
@@ -157,6 +156,8 @@ int main(int argc, char ** argv)
 {
     QApplication app(argc, argv);
 
+    QML_REGISTER_TYPE(QmlTime, 1, 0, Timer, Timer);
+
     uint iterations = 1024;
     QString filename;
     bool willParent = false;
diff --git a/tests/benchmarks/declarative/script/tst_script.cpp b/tests/benchmarks/declarative/script/tst_script.cpp
index dd21997..a90a98b 100644
--- a/tests/benchmarks/declarative/script/tst_script.cpp
+++ b/tests/benchmarks/declarative/script/tst_script.cpp
@@ -55,6 +55,8 @@ public:
     tst_script() {}
 
 private slots:
+    void initTestCase();
+
     void property_js();
     void property_getter();
     void property_getter_js();
@@ -88,6 +90,11 @@ private slots:
 private:
 };
 
+void tst_script::initTestCase()
+{
+    QML_REGISTER_TYPE(Qt.test, 1, 0, TestObject, TestObject);
+}
+
 inline QUrl TEST_FILE(const QString &filename)
 {
     return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
@@ -123,7 +130,6 @@ private:
     int m_x;
 };
 QML_DECLARE_TYPE(TestObject);
-QML_DEFINE_TYPE(Qt.test, 1, 0, TestObject, TestObject);
 
 TestObject::TestObject(QObject *parent)
 : QObject(parent), m_x(0)