qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Brasser 2011-08-30 08:17:48 +10:00 committed by Qt by Nokia
parent e71904e231
commit 4f0e074a5e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/benchmarks/declarative/creation/creation.pro
View File

@ -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

8
tests/benchmarks/declarative/creation/tst_creation.cpp
View File

@ -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);