diff options
Diffstat (limited to 'tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp')
-rw-r--r-- | tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp index cd8f7b7b0c..5971649da0 100644 --- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp +++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp @@ -46,7 +46,7 @@ #include "../../shared/util.h" #include <QtDeclarative/qdeclarativescriptstring.h> -class tst_qdeclarativeconnection : public QObject +class tst_qdeclarativeconnection : public QDeclarativeDataTest { Q_OBJECT public: @@ -75,7 +75,7 @@ tst_qdeclarativeconnection::tst_qdeclarativeconnection() void tst_qdeclarativeconnection::defaultValues() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("test-connection3.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("test-connection3.qml")); QDeclarativeConnections *item = qobject_cast<QDeclarativeConnections*>(c.create()); QVERIFY(item != 0); @@ -87,7 +87,7 @@ void tst_qdeclarativeconnection::defaultValues() void tst_qdeclarativeconnection::properties() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("test-connection2.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("test-connection2.qml")); QDeclarativeConnections *item = qobject_cast<QDeclarativeConnections*>(c.create()); QVERIFY(item != 0); @@ -101,7 +101,7 @@ void tst_qdeclarativeconnection::properties() void tst_qdeclarativeconnection::connection() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("test-connection.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("test-connection.qml")); QQuickItem *item = qobject_cast<QQuickItem*>(c.create()); QVERIFY(item != 0); @@ -118,7 +118,7 @@ void tst_qdeclarativeconnection::connection() void tst_qdeclarativeconnection::trimming() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("trimming.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("trimming.qml")); QQuickItem *item = qobject_cast<QQuickItem*>(c.create()); QVERIFY(item != 0); @@ -139,7 +139,7 @@ void tst_qdeclarativeconnection::trimming() void tst_qdeclarativeconnection::targetChanged() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("connection-targetchange.qml"))); + QDeclarativeComponent c(&engine, testFileUrl("connection-targetchange.qml")); QQuickItem *item = qobject_cast<QQuickItem*>(c.create()); QVERIFY(item != 0); @@ -176,7 +176,7 @@ void tst_qdeclarativeconnection::unknownSignals() QFETCH(QString, file); QFETCH(QString, error); - QUrl url = QUrl::fromLocalFile(TESTDATA(file)); + QUrl url = testFileUrl(file); if (!error.isEmpty()) { QTest::ignoreMessage(QtWarningMsg, (url.toString() + error).toLatin1()); } else { @@ -214,7 +214,7 @@ void tst_qdeclarativeconnection::errors() QFETCH(QString, file); QFETCH(QString, error); - QUrl url = QUrl::fromLocalFile(TESTDATA(file)); + QUrl url = testFileUrl(file); QDeclarativeEngine engine; QDeclarativeComponent c(&engine, url); @@ -264,7 +264,7 @@ static QObject *module_api_factory(QDeclarativeEngine *engine, QJSEngine *script void tst_qdeclarativeconnection::moduleApiTarget() { qmlRegisterModuleApi("MyTestModuleApi", 1, 0, module_api_factory); - QDeclarativeComponent component(&engine, QUrl::fromLocalFile(TESTDATA("moduleapi-target.qml"))); + QDeclarativeComponent component(&engine, testFileUrl("moduleapi-target.qml")); QObject *object = component.create(); QVERIFY(object != 0); |