From: Michael Brasser <michael.brasser@nokia.com>
Date: Mon, 29 Aug 2011 22:17:48 +0000 (+1000)
Subject: Compile fix for QML object creation benchmark.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=4f0e074a5ea3365e3680c1e92e46211795cf6019;p=konrad%2Fqtdeclarative.git

Compile fix for QML object creation benchmark.

Change-Id: I0a2948728796e72651c86f84f0a296b63e22044f
Reviewed-on: http://codereview.qt.nokia.com/3825
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
---

diff --git a/tests/benchmarks/declarative/creation/creation.pro b/tests/benchmarks/declarative/creation/creation.pro
index 74cb47f..8241ace 100644
--- a/tests/benchmarks/declarative/creation/creation.pro
+++ b/tests/benchmarks/declarative/creation/creation.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 TEMPLATE = app
 TARGET = tst_creation
-QT += declarative
+QT += declarative qtquick1
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_creation.cpp
@@ -13,3 +13,5 @@ symbian {
 } else {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
+
+QT += core-private gui-private declarative-private qtquick1-private
diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/declarative/creation/tst_creation.cpp
index 4085688..6659eb5 100644
--- a/tests/benchmarks/declarative/creation/tst_creation.cpp
+++ b/tests/benchmarks/declarative/creation/tst_creation.cpp
@@ -48,7 +48,7 @@
 #include <QGraphicsItem>
 #include <QDeclarativeItem>
 #include <QDeclarativeContext>
-#include <private/qdeclarativetextinput_p.h>
+#include <QtQuick1/private/qdeclarativetextinput_p.h>
 #include <private/qobject_p.h>
 
 #ifdef Q_OS_SYMBIAN
@@ -111,7 +111,7 @@ tst_creation::tst_creation()
     qmlRegisterType<TestType>("Qt.test", 1, 0, "TestType");
 
     //get rid of initialization effects
-    QDeclarativeTextInput te;
+    QDeclarative1TextInput te;
 }
 
 inline QUrl TEST_FILE(const QString &filename)
@@ -206,7 +206,7 @@ void tst_creation::qobject_10tree_cpp()
 
 void tst_creation::qobject_qmltype()
 {
-    QDeclarativeType *t = QDeclarativeMetaType::qmlType("Qt/QtObject", 4, 7);
+    QDeclarativeType *t = QDeclarativeMetaType::qmlType("QtQuick/QtObject", 2, 0);
 
     QBENCHMARK {
         QObject *obj = t->create();
@@ -350,7 +350,7 @@ void tst_creation::elements_data()
 void tst_creation::elements()
 {
     QFETCH(QByteArray, type);
-    QDeclarativeType *t = QDeclarativeMetaType::qmlType(type, 4, 7);
+    QDeclarativeType *t = QDeclarativeMetaType::qmlType(type, 2, 0);
     if (!t || !t->isCreatable())
         QSKIP("Non-creatable type", SkipSingle);