diff options
Diffstat (limited to 'tests/benchmarks')
-rw-r--r-- | tests/benchmarks/declarative/compilation/tst_compilation.cpp | 6 | ||||
-rw-r--r-- | tests/benchmarks/declarative/creation/creation.pro | 4 | ||||
-rw-r--r-- | tests/benchmarks/declarative/creation/tst_creation.cpp | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/tests/benchmarks/declarative/compilation/tst_compilation.cpp b/tests/benchmarks/declarative/compilation/tst_compilation.cpp index 98008d8bf8..9b4f9a70e8 100644 --- a/tests/benchmarks/declarative/compilation/tst_compilation.cpp +++ b/tests/benchmarks/declarative/compilation/tst_compilation.cpp @@ -44,10 +44,10 @@ #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> #include <QtDeclarative/private/qdeclarativejsengine_p.h> -#include <QtDeclarative/private/qdeclarativejsnodepool_p.h> +#include <QtDeclarative/private/qdeclarativejsmemorypool_p.h> #include <QtDeclarative/private/qdeclarativejsparser_p.h> #include <QtDeclarative/private/qdeclarativejslexer_p.h> -#include <QtDeclarative/private/qdeclarativescriptparser_p.h> +#include <QtDeclarative/private/qdeclarativescript_p.h> #include <QFile> #include <QDebug> @@ -154,7 +154,7 @@ void tst_compilation::scriptparser() QUrl url = QUrl::fromLocalFile(file); QBENCHMARK { - QDeclarativeScriptParser parser; + QDeclarativeScript::Parser parser; parser.parse(data, url); parser.tree(); } 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); |