diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-08-30 08:17:48 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-30 00:19:48 +0200 |
| commit | 4f0e074a5ea3365e3680c1e92e46211795cf6019 (patch) | |
| tree | 766b05388929dc8d3d1d0c0a8adf29e0859cd915 /tests | |
| parent | e71904e231e27e6f6f88b35c4a7e2d7cf8ba2640 (diff) | |
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/benchmarks/declarative/creation/creation.pro | 4 | ||||
| -rw-r--r-- | tests/benchmarks/declarative/creation/tst_creation.cpp | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/benchmarks/declarative/creation/creation.pro b/tests/benchmarks/declarative/creation/creation.pro index 74cb47fb73..8241ace5a6 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 4085688845..6659eb5989 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); |