diff options
Diffstat (limited to 'tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp')
-rw-r--r-- | tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp index 8681592d..3925b5a6 100644 --- a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp +++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include <qtest.h> +#include <qdeclarativedatatest.h> #include <QUrl> #include <QFileInfo> #include <QDir> @@ -50,18 +51,7 @@ #include <QtQuick1/qdeclarativeproperty.h> #include <QDebug> -inline QUrl TEST_FILE(const QString &filename) -{ - QFileInfo fileInfo(__FILE__); - return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath("data/" + filename)); -} - -inline QUrl TEST_FILE(const char *filename) -{ - return TEST_FILE(QLatin1String(filename)); -} - -class tst_qdeclarativelistreference : public QObject +class tst_qdeclarativelistreference : public QDeclarativeDataTest { Q_OBJECT public: @@ -105,6 +95,7 @@ public: void tst_qdeclarativelistreference::initTestCase() { + QDeclarativeDataTest::initTestCase(); qmlRegisterType<TestType>(); } @@ -540,7 +531,7 @@ void tst_qdeclarativelistreference::qmlmetaproperty() void tst_qdeclarativelistreference::engineTypes() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TEST_FILE("engineTypes.qml")); + QDeclarativeComponent component(&engine, testFileUrl("engineTypes.qml")); QObject *o = component.create(); QVERIFY(o); @@ -563,7 +554,7 @@ void tst_qdeclarativelistreference::engineTypes() void tst_qdeclarativelistreference::variantToList() { QDeclarativeEngine engine; - QDeclarativeComponent component(&engine, TEST_FILE("variantToList.qml")); + QDeclarativeComponent component(&engine, testFileUrl("variantToList.qml")); QObject *o = component.create(); QVERIFY(o); |