From 72f4ccecf457eaa34469e9d7c2d05802214904d6 Mon Sep 17 00:00:00 2001 From: Kurt Korbatits Date: Tue, 6 Mar 2012 14:48:21 +1000 Subject: [PATCH] Changed quick tests to work from install directory - Changed tests to use TESTDATA - added check for cross_compile option to skip when sources not available Change-Id: I1f382794ff982bbc07fc20438a4e4a8c8b8d565f Reviewed-by: Michael Brasser Reviewed-by: Jason McDonald --- tests/auto/quick/examples/examples.pro | 2 ++ tests/auto/quick/examples/tst_examples.cpp | 8 ++++++++ tests/auto/quick/qquickaccessible/qquickaccessible.pro | 4 ++-- tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp | 6 +++--- tests/auto/quick/qquickanchors/qquickanchors.pro | 4 +--- tests/auto/quick/qquickanimatedimage/qquickanimatedimage.pro | 4 +--- tests/auto/quick/qquickanimatedsprite/qquickanimatedsprite.pro | 4 +--- .../quick/qquickanimationcontroller/qquickanimationcontroller.pro | 4 +--- tests/auto/quick/qquickanimations/qquickanimations.pro | 4 +--- tests/auto/quick/qquickbehaviors/qquickbehaviors.pro | 4 +--- tests/auto/quick/qquickborderimage/qquickborderimage.pro | 4 +--- tests/auto/quick/qquickcanvas/qquickcanvas.pro | 4 +--- tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro | 4 +--- tests/auto/quick/qquickflickable/qquickflickable.pro | 4 +--- tests/auto/quick/qquickflipable/qquickflipable.pro | 4 +--- tests/auto/quick/qquickfocusscope/qquickfocusscope.pro | 4 +--- tests/auto/quick/qquickfontloader/qquickfontloader.pro | 4 +--- tests/auto/quick/qquickgridview/qquickgridview.pro | 4 +--- tests/auto/quick/qquickimage/qquickimage.pro | 4 +--- tests/auto/quick/qquickitem/qquickitem.pro | 4 +--- tests/auto/quick/qquickitem2/qquickitem2.pro | 4 +--- tests/auto/quick/qquickitemlayer/qquickitemlayer.pro | 4 +--- tests/auto/quick/qquicklistview/qquicklistview.pro | 4 +--- tests/auto/quick/qquickloader/qquickloader.pro | 4 +--- tests/auto/quick/qquickmousearea/qquickmousearea.pro | 4 +--- .../quick/qquickmultipointtoucharea/qquickmultipointtoucharea.pro | 4 +--- tests/auto/quick/qquickpath/qquickpath.pro | 4 +--- tests/auto/quick/qquickpathview/qquickpathview.pro | 4 +--- tests/auto/quick/qquickpincharea/qquickpincharea.pro | 4 +--- tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro | 4 +--- tests/auto/quick/qquickpositioners/qquickpositioners.pro | 4 +--- tests/auto/quick/qquickrepeater/qquickrepeater.pro | 4 +--- .../quick/qquicksmoothedanimation/qquicksmoothedanimation.pro | 4 +--- tests/auto/quick/qquickspringanimation/qquickspringanimation.pro | 4 +--- tests/auto/quick/qquickspriteimage/qquickspriteimage.pro | 4 +--- tests/auto/quick/qquickspritesequence/qquickspritesequence.pro | 4 +--- tests/auto/quick/qquickstates/qquickstates.pro | 4 +--- tests/auto/quick/qquicktext/qquicktext.pro | 4 +--- tests/auto/quick/qquicktextedit/qquicktextedit.pro | 4 +--- tests/auto/quick/qquicktextinput/qquicktextinput.pro | 4 +--- tests/auto/quick/qquickview/qquickview.pro | 4 +--- tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro | 4 +--- tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro | 4 +--- tests/auto/quick/rendernode/rendernode.pro | 4 +--- 44 files changed, 55 insertions(+), 125 deletions(-) diff --git a/tests/auto/quick/examples/examples.pro b/tests/auto/quick/examples/examples.pro index e67120d..5907ba2 100644 --- a/tests/auto/quick/examples/examples.pro +++ b/tests/auto/quick/examples/examples.pro @@ -8,3 +8,5 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary QT += core-private gui-private qml-private quick-private widgets-private v8-private testlib + +cross_compile: DEFINES += QTEST_CROSS_COMPILED diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp index 482053e..c29da57 100644 --- a/tests/auto/quick/examples/tst_examples.cpp +++ b/tests/auto/quick/examples/tst_examples.cpp @@ -237,6 +237,10 @@ void tst_examples::sgexamples() { QFETCH(QString, file); +#if defined(QTEST_CROSS_COMPILED) + QSKIP("sources not available when cross compiled"); +#endif + QQmlComponent component(&engine, QUrl::fromLocalFile(file)); if (component.status() == QQmlComponent::Error) qWarning() << component.errors(); @@ -274,6 +278,10 @@ void tst_examples::sgsnippets() { QFETCH(QString, file); +#if defined(QTEST_CROSS_COMPILED) + QSKIP("sources not available when cross compiled"); +#endif + QQmlComponent component(&engine, QUrl::fromLocalFile(file)); if (component.status() == QQmlComponent::Error) qWarning() << component.errors(); diff --git a/tests/auto/quick/qquickaccessible/qquickaccessible.pro b/tests/auto/quick/qquickaccessible/qquickaccessible.pro index ca50f5d..1c811d7 100644 --- a/tests/auto/quick/qquickaccessible/qquickaccessible.pro +++ b/tests/auto/quick/qquickaccessible/qquickaccessible.pro @@ -8,13 +8,13 @@ SOURCES += tst_qquickaccessible.cpp include (../../shared/util.pri) +TESTDATA = data/* + OTHER_FILES += data/checkbuttons.qml OTHER_FILES += data/hittest.qml OTHER_FILES += data/pushbutton.qml OTHER_FILES += data/statictext.qml -DEFINES += SRCDIR=\\\"$$PWD\\\" - CONFIG += parallel_test wince*: { diff --git a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp index d656661..48c07c6 100644 --- a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp +++ b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp @@ -129,8 +129,8 @@ void tst_QQuickAccessible::commonTests_data() { QTest::addColumn("accessibleRoleFileName"); - QTest::newRow("StaticText") << SRCDIR "/data/statictext.qml"; - QTest::newRow("PushButton") << SRCDIR "/data/pushbutton.qml"; + QTest::newRow("StaticText") << "statictext.qml"; + QTest::newRow("PushButton") << "pushbutton.qml"; } void tst_QQuickAccessible::commonTests() @@ -141,7 +141,7 @@ void tst_QQuickAccessible::commonTests() QQuickView *view = new QQuickView(); // view->setFixedSize(240,320); - view->setSource(QUrl::fromLocalFile(accessibleRoleFileName)); + view->setSource(testFileUrl(accessibleRoleFileName)); view->show(); // view->setFocus(); QVERIFY(view->rootObject() != 0); diff --git a/tests/auto/quick/qquickanchors/qquickanchors.pro b/tests/auto/quick/qquickanchors/qquickanchors.pro index 30e6e6d..343f39b 100644 --- a/tests/auto/quick/qquickanchors/qquickanchors.pro +++ b/tests/auto/quick/qquickanchors/qquickanchors.pro @@ -7,9 +7,7 @@ include (../shared/util.pri) macx:CONFIG -= app_bundle -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickanimatedimage/qquickanimatedimage.pro b/tests/auto/quick/qquickanimatedimage/qquickanimatedimage.pro index 468a325..e2d68f1 100644 --- a/tests/auto/quick/qquickanimatedimage/qquickanimatedimage.pro +++ b/tests/auto/quick/qquickanimatedimage/qquickanimatedimage.pro @@ -8,9 +8,7 @@ include (../../shared/util.pri) macx:CONFIG -= app_bundle -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickanimatedsprite/qquickanimatedsprite.pro b/tests/auto/quick/qquickanimatedsprite/qquickanimatedsprite.pro index 3c20cce..0429867 100644 --- a/tests/auto/quick/qquickanimatedsprite/qquickanimatedsprite.pro +++ b/tests/auto/quick/qquickanimatedsprite/qquickanimatedsprite.pro @@ -6,9 +6,7 @@ include (../../shared/util.pri) macx:CONFIG -= app_bundle -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro b/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro index 72a09fc..c09eb5c 100644 --- a/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro +++ b/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro @@ -5,6 +5,4 @@ TARGET=tst_qquickanimationcontroller CONFIG += warn_on qmltestcase SOURCES += tst_qquickanimationcontroller.cpp -importFiles.files = data -importFiles.path = . -DEPLOYMENT += importFiles +TESTDATA = data/* diff --git a/tests/auto/quick/qquickanimations/qquickanimations.pro b/tests/auto/quick/qquickanimations/qquickanimations.pro index 0e432ab..d9c3ea2 100644 --- a/tests/auto/quick/qquickanimations/qquickanimations.pro +++ b/tests/auto/quick/qquickanimations/qquickanimations.pro @@ -6,9 +6,7 @@ include (../../shared/util.pri) macx:CONFIG -= app_bundle -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro b/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro index fc103ed..dcffad6 100644 --- a/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro +++ b/tests/auto/quick/qquickbehaviors/qquickbehaviors.pro @@ -6,9 +6,7 @@ include (../../shared/util.pri) macx:CONFIG -= app_bundle -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickborderimage/qquickborderimage.pro b/tests/auto/quick/qquickborderimage/qquickborderimage.pro index f50149a..c967d57 100644 --- a/tests/auto/quick/qquickborderimage/qquickborderimage.pro +++ b/tests/auto/quick/qquickborderimage/qquickborderimage.pro @@ -8,9 +8,7 @@ SOURCES += tst_qquickborderimage.cpp \ include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickcanvas/qquickcanvas.pro b/tests/auto/quick/qquickcanvas/qquickcanvas.pro index 7f27a05..817eb25 100644 --- a/tests/auto/quick/qquickcanvas/qquickcanvas.pro +++ b/tests/auto/quick/qquickcanvas/qquickcanvas.pro @@ -9,9 +9,7 @@ macx:CONFIG -= app_bundle CONFIG += parallel_test QT += core-private gui-private qml-private quick-private testlib -testData.files = data -testData.path = . -DEPLOYMENT += testData +TESTDATA = data/* OTHER_FILES += \ data/AnimationsWhileHidden.qml \ diff --git a/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro b/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro index ccf8947..b0122f9 100644 --- a/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro +++ b/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro @@ -5,9 +5,7 @@ TARGET=tst_qquickcanvasitem CONFIG += warn_on qmltestcase SOURCES += tst_qquickcanvasitem.cpp -importFiles.files = data -importFiles.path = . -DEPLOYMENT += importFiles +TESTDATA = data/* OTHER_FILES += \ data/testhelper.js \ diff --git a/tests/auto/quick/qquickflickable/qquickflickable.pro b/tests/auto/quick/qquickflickable/qquickflickable.pro index 0ca03b2..35d9b8c 100644 --- a/tests/auto/quick/qquickflickable/qquickflickable.pro +++ b/tests/auto/quick/qquickflickable/qquickflickable.pro @@ -7,9 +7,7 @@ SOURCES += tst_qquickflickable.cpp include (../../shared/util.pri) include (../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test QT += core-private gui-private v8-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquickflipable/qquickflipable.pro b/tests/auto/quick/qquickflipable/qquickflipable.pro index ca98cbe..1198a1f 100644 --- a/tests/auto/quick/qquickflipable/qquickflipable.pro +++ b/tests/auto/quick/qquickflipable/qquickflipable.pro @@ -6,9 +6,7 @@ SOURCES += tst_qquickflipable.cpp include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickfocusscope/qquickfocusscope.pro b/tests/auto/quick/qquickfocusscope/qquickfocusscope.pro index 34de32b..7a4b730 100644 --- a/tests/auto/quick/qquickfocusscope/qquickfocusscope.pro +++ b/tests/auto/quick/qquickfocusscope/qquickfocusscope.pro @@ -7,8 +7,6 @@ include (../shared/util.pri) macx:CONFIG -= app_bundle -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquickfontloader/qquickfontloader.pro b/tests/auto/quick/qquickfontloader/qquickfontloader.pro index 7c34c43..2eeb286 100644 --- a/tests/auto/quick/qquickfontloader/qquickfontloader.pro +++ b/tests/auto/quick/qquickfontloader/qquickfontloader.pro @@ -8,9 +8,7 @@ SOURCES += tst_qquickfontloader.cpp \ include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickgridview/qquickgridview.pro b/tests/auto/quick/qquickgridview/qquickgridview.pro index cabf439..b4a234e 100644 --- a/tests/auto/quick/qquickgridview/qquickgridview.pro +++ b/tests/auto/quick/qquickgridview/qquickgridview.pro @@ -7,9 +7,7 @@ SOURCES += tst_qquickgridview.cpp include (../../shared/util.pri) include (../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib widgets diff --git a/tests/auto/quick/qquickimage/qquickimage.pro b/tests/auto/quick/qquickimage/qquickimage.pro index a68a787..ad0097d 100644 --- a/tests/auto/quick/qquickimage/qquickimage.pro +++ b/tests/auto/quick/qquickimage/qquickimage.pro @@ -9,9 +9,7 @@ SOURCES += tst_qquickimage.cpp \ include (../../shared/util.pri) include (../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test QT += core-private gui-private qml-private quick-private network testlib diff --git a/tests/auto/quick/qquickitem/qquickitem.pro b/tests/auto/quick/qquickitem/qquickitem.pro index cf24e63..cbbd6e5 100644 --- a/tests/auto/quick/qquickitem/qquickitem.pro +++ b/tests/auto/quick/qquickitem/qquickitem.pro @@ -6,9 +6,7 @@ include (../../shared/util.pri) macx:CONFIG -= app_bundle -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test QT += core-private gui-private v8-private qml-private quick-private widgets testlib diff --git a/tests/auto/quick/qquickitem2/qquickitem2.pro b/tests/auto/quick/qquickitem2/qquickitem2.pro index 29897ba..887c879 100644 --- a/tests/auto/quick/qquickitem2/qquickitem2.pro +++ b/tests/auto/quick/qquickitem2/qquickitem2.pro @@ -6,9 +6,7 @@ SOURCES += tst_qquickitem.cpp include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro b/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro index a2d5f40..9ffdbe7 100644 --- a/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro +++ b/tests/auto/quick/qquickitemlayer/qquickitemlayer.pro @@ -4,9 +4,7 @@ SOURCES += tst_qquickitemlayer.cpp macx:CONFIG -= app_bundle -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* include(../../shared/util.pri) diff --git a/tests/auto/quick/qquicklistview/qquicklistview.pro b/tests/auto/quick/qquicklistview/qquicklistview.pro index 4cac8e7..d4d97e2 100644 --- a/tests/auto/quick/qquicklistview/qquicklistview.pro +++ b/tests/auto/quick/qquicklistview/qquicklistview.pro @@ -9,8 +9,6 @@ SOURCES += tst_qquicklistview.cpp \ include (../../shared/util.pri) include (../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* QT += core-private gui-private qml-private quick-private widgets widgets-private v8-private opengl-private testlib diff --git a/tests/auto/quick/qquickloader/qquickloader.pro b/tests/auto/quick/qquickloader/qquickloader.pro index fd52535..2961ed9 100644 --- a/tests/auto/quick/qquickloader/qquickloader.pro +++ b/tests/auto/quick/qquickloader/qquickloader.pro @@ -10,9 +10,7 @@ SOURCES += tst_qquickloader.cpp \ include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickmousearea/qquickmousearea.pro b/tests/auto/quick/qquickmousearea/qquickmousearea.pro index c75db5e..99e9b9a 100644 --- a/tests/auto/quick/qquickmousearea/qquickmousearea.pro +++ b/tests/auto/quick/qquickmousearea/qquickmousearea.pro @@ -8,9 +8,7 @@ SOURCES += tst_qquickmousearea.cpp \ include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickmultipointtoucharea/qquickmultipointtoucharea.pro b/tests/auto/quick/qquickmultipointtoucharea/qquickmultipointtoucharea.pro index 3c6f304..8181eb8 100644 --- a/tests/auto/quick/qquickmultipointtoucharea/qquickmultipointtoucharea.pro +++ b/tests/auto/quick/qquickmultipointtoucharea/qquickmultipointtoucharea.pro @@ -4,8 +4,6 @@ macx:CONFIG -= app_bundle SOURCES += tst_qquickmultipointtoucharea.cpp -importFiles.files = data -importFiles.path = . -DEPLOYMENT += importFiles +TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquickpath/qquickpath.pro b/tests/auto/quick/qquickpath/qquickpath.pro index e1f0f7b..59a165b 100644 --- a/tests/auto/quick/qquickpath/qquickpath.pro +++ b/tests/auto/quick/qquickpath/qquickpath.pro @@ -6,9 +6,7 @@ SOURCES += tst_qquickpath.cpp include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickpathview/qquickpathview.pro b/tests/auto/quick/qquickpathview/qquickpathview.pro index 52f00ce..0f2ac8f 100644 --- a/tests/auto/quick/qquickpathview/qquickpathview.pro +++ b/tests/auto/quick/qquickpathview/qquickpathview.pro @@ -7,9 +7,7 @@ SOURCES += tst_qquickpathview.cpp include (../../shared/util.pri) include (../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test QT += core-private gui-private v8-private qml-private quick-private widgets testlib diff --git a/tests/auto/quick/qquickpincharea/qquickpincharea.pro b/tests/auto/quick/qquickpincharea/qquickpincharea.pro index 514dd25..31ce4da 100644 --- a/tests/auto/quick/qquickpincharea/qquickpincharea.pro +++ b/tests/auto/quick/qquickpincharea/qquickpincharea.pro @@ -6,9 +6,7 @@ SOURCES += tst_qquickpincharea.cpp include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro b/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro index 7611e37..a13b0b6 100644 --- a/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro +++ b/tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro @@ -9,9 +9,7 @@ INCLUDEPATH += ../../shared/ include (../../shared/util.pri) -importFiles.files = data -importFiles.path = . -DEPLOYMENT += importFiles +TESTDATA = data/* # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage # LIBS += -lgcov diff --git a/tests/auto/quick/qquickpositioners/qquickpositioners.pro b/tests/auto/quick/qquickpositioners/qquickpositioners.pro index 5633796..243d034 100644 --- a/tests/auto/quick/qquickpositioners/qquickpositioners.pro +++ b/tests/auto/quick/qquickpositioners/qquickpositioners.pro @@ -7,9 +7,7 @@ include (../../shared/util.pri) macx:CONFIG -= app_bundle -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib diff --git a/tests/auto/quick/qquickrepeater/qquickrepeater.pro b/tests/auto/quick/qquickrepeater/qquickrepeater.pro index c3d96ee..eb1c9fe 100644 --- a/tests/auto/quick/qquickrepeater/qquickrepeater.pro +++ b/tests/auto/quick/qquickrepeater/qquickrepeater.pro @@ -7,9 +7,7 @@ SOURCES += tst_qquickrepeater.cpp include (../../shared/util.pri) include (../shared/util.pri) -testFiles.files = data -testFiles.path = . -DEPLOYMENT += testFiles +TESTDATA = data/* CONFIG += parallel_test QT += core-private gui-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro b/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro index 0d5567d..6f82739 100644 --- a/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro +++ b/tests/auto/quick/qquicksmoothedanimation/qquicksmoothedanimation.pro @@ -6,9 +6,7 @@ SOURCES += tst_qquicksmoothedanimation.cpp include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro b/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro index 8ad472f..8db4c60 100644 --- a/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro +++ b/tests/auto/quick/qquickspringanimation/qquickspringanimation.pro @@ -6,9 +6,7 @@ SOURCES += tst_qquickspringanimation.cpp include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickspriteimage/qquickspriteimage.pro b/tests/auto/quick/qquickspriteimage/qquickspriteimage.pro index 5061379..02d45b9 100644 --- a/tests/auto/quick/qquickspriteimage/qquickspriteimage.pro +++ b/tests/auto/quick/qquickspriteimage/qquickspriteimage.pro @@ -6,9 +6,7 @@ include (../../shared/util.pri) macx:CONFIG -= app_bundle -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickspritesequence/qquickspritesequence.pro b/tests/auto/quick/qquickspritesequence/qquickspritesequence.pro index 3dabd06..d9b3a91 100644 --- a/tests/auto/quick/qquickspritesequence/qquickspritesequence.pro +++ b/tests/auto/quick/qquickspritesequence/qquickspritesequence.pro @@ -6,9 +6,7 @@ include (../../shared/util.pri) macx:CONFIG -= app_bundle -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickstates/qquickstates.pro b/tests/auto/quick/qquickstates/qquickstates.pro index ec88168..5f2b8cd 100644 --- a/tests/auto/quick/qquickstates/qquickstates.pro +++ b/tests/auto/quick/qquickstates/qquickstates.pro @@ -6,9 +6,7 @@ SOURCES += tst_qquickstates.cpp include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib diff --git a/tests/auto/quick/qquicktext/qquicktext.pro b/tests/auto/quick/qquicktext/qquicktext.pro index 67e0b9f..53e170a 100644 --- a/tests/auto/quick/qquicktext/qquicktext.pro +++ b/tests/auto/quick/qquicktext/qquicktext.pro @@ -10,9 +10,7 @@ SOURCES += ../../shared/testhttpserver.cpp include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquicktextedit/qquicktextedit.pro b/tests/auto/quick/qquicktextedit/qquicktextedit.pro index 39a5178..23459f2 100644 --- a/tests/auto/quick/qquicktextedit/qquicktextedit.pro +++ b/tests/auto/quick/qquicktextedit/qquicktextedit.pro @@ -9,8 +9,6 @@ HEADERS += ../../shared/testhttpserver.h include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* QT += core-private gui-private v8-private qml-private quick-private opengl-private network widgets-private testlib diff --git a/tests/auto/quick/qquicktextinput/qquicktextinput.pro b/tests/auto/quick/qquicktextinput/qquicktextinput.pro index 78b39a2..046e6ab 100644 --- a/tests/auto/quick/qquicktextinput/qquicktextinput.pro +++ b/tests/auto/quick/qquicktextinput/qquicktextinput.pro @@ -6,8 +6,6 @@ SOURCES += tst_qquicktextinput.cpp include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* QT += core-private gui-private v8-private qml-private quick-private opengl-private testlib diff --git a/tests/auto/quick/qquickview/qquickview.pro b/tests/auto/quick/qquickview/qquickview.pro index 77b0f7d..1302908 100644 --- a/tests/auto/quick/qquickview/qquickview.pro +++ b/tests/auto/quick/qquickview/qquickview.pro @@ -6,8 +6,6 @@ SOURCES += tst_qquickview.cpp include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* QT += core-private gui-private qml-private quick-private testlib diff --git a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro index bfadf19..4ae6781 100644 --- a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro +++ b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro @@ -7,9 +7,7 @@ SOURCES += tst_qquickvisualdatamodel.cpp include (../../shared/util.pri) include (../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro b/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro index b18af50..88975d8 100644 --- a/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro +++ b/tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro @@ -6,9 +6,7 @@ SOURCES += tst_qquickxmllistmodel.cpp include (../../shared/util.pri) -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* CONFIG += parallel_test diff --git a/tests/auto/quick/rendernode/rendernode.pro b/tests/auto/quick/rendernode/rendernode.pro index 8484d59..3e52cda 100644 --- a/tests/auto/quick/rendernode/rendernode.pro +++ b/tests/auto/quick/rendernode/rendernode.pro @@ -4,9 +4,7 @@ SOURCES += tst_rendernode.cpp macx:CONFIG -= app_bundle -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles +TESTDATA = data/* include(../../shared/util.pri) -- 2.7.4