diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2013-05-31 14:48:24 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-06 09:31:33 +0200 |
| commit | cd4820fbbe1bd1d8a3ba74fcfc91c4264682b602 (patch) | |
| tree | 17b2753a9c14ec42de6d9dd1bac2aecea95152b7 /tests/benchmarks/qml/creation | |
| parent | 75c8ae12a30d622de464554c3c1da96afbed9590 (diff) | |
Fix compilation of QML benchmarks
Change-Id: I2d612108ec8d69a0a9318cd26f6adcbb74f34138
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/benchmarks/qml/creation')
| -rw-r--r-- | tests/benchmarks/qml/creation/creation.pro | 3 | ||||
| -rw-r--r-- | tests/benchmarks/qml/creation/tst_creation.cpp | 8 |
2 files changed, 2 insertions, 9 deletions
diff --git a/tests/benchmarks/qml/creation/creation.pro b/tests/benchmarks/qml/creation/creation.pro index 8d26ef88df..0cfac64d5f 100644 --- a/tests/benchmarks/qml/creation/creation.pro +++ b/tests/benchmarks/qml/creation/creation.pro @@ -1,11 +1,10 @@ CONFIG += testcase TEMPLATE = app TARGET = tst_creation +QT += core-private gui-private qml-private quick-private widgets testlib macx:CONFIG -= app_bundle SOURCES += tst_creation.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" - -QT += core-private gui-private qml-private qtquick1-private widgets testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/qml/creation/tst_creation.cpp b/tests/benchmarks/qml/creation/tst_creation.cpp index 4b5c1d1950..b6b402a6c0 100644 --- a/tests/benchmarks/qml/creation/tst_creation.cpp +++ b/tests/benchmarks/qml/creation/tst_creation.cpp @@ -48,7 +48,6 @@ #include <QGraphicsItem> #include <QQuickItem> #include <QQmlContext> -#include <QtQuick1/private/qdeclarativetextinput_p.h> #include <private/qobject_p.h> class tst_creation : public QObject @@ -96,7 +95,7 @@ public: : QObject(parent) {} QQmlListProperty<QObject> resources() { - return QQmlListProperty<QObject>(this, 0, resources_append); + return QQmlListProperty<QObject>(this, 0, resources_append, 0, 0, 0); } static void resources_append(QQmlListProperty<QObject> *p, QObject *o) { @@ -107,9 +106,6 @@ public: tst_creation::tst_creation() { qmlRegisterType<TestType>("Qt.test", 1, 0, "TestType"); - - //get rid of initialization effects - QDeclarative1TextInput te; } inline QUrl TEST_FILE(const QString &filename) @@ -321,9 +317,7 @@ void tst_creation::itemtree_qml() void tst_creation::itemtree_scene_cpp() { - QGraphicsScene scene; QQuickItem *root = new QQuickItem; - scene.addItem(root); QBENCHMARK { QQuickItem *item = new QQuickItem; for (int i = 0; i < 30; ++i) { |