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 <michael.brasser@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

44 files changed, 55 insertions, 125 deletions

diff --git a/tests/auto/quick/examples/examples.pro b/tests/auto/quick/examples/examples.pro
index e67120d7c2..5907ba291c 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 482053e158..c29da570c3 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 ca50f5d8af..1c811d75b7 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 d65666162d..48c07c6e2c 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<QString>("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 30e6e6dcf8..343f39b6f0 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 468a3253f8..e2d68f191c 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 3c20ccea66..04298673b6 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 72a09fcb9c..c09eb5c98c 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 0e432ab9f1..d9c3ea28c1 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 fc103ed4c2..dcffad6cd9 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 f50149aead..c967d579e5 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 7f27a05243..817eb2534f 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 ccf894715f..b0122f997a 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 0ca03b2497..35d9b8cbb6 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 ca98cbe279..1198a1f646 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 34de32b173..7a4b7302d0 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 7c34c43d04..2eeb286e61 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 cabf4396b4..b4a234e35a 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 a68a7870d8..ad0097df08 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 cf24e63d05..cbbd6e586b 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 29897ba3c1..887c8796a8 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 a2d5f401ff..9ffdbe7454 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 4cac8e7665..d4d97e2106 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 fd525351ab..2961ed9429 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 c75db5ea55..99e9b9a464 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 3c6f304284..8181eb8c5f 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 e1f0f7b278..59a165bb95 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 52f00ce3f8..0f2ac8ff0e 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 514dd25a5a..31ce4da90a 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 7611e37b49..a13b0b6f43 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 563379652b..243d03484a 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 c3d96ee6d5..eb1c9fe9b1 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 0d5567da8d..6f8273956a 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 8ad472f8cc..8db4c606c9 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 50613792de..02d45b97c4 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 3dabd065a0..d9b3a9120c 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 ec881680ea..5f2b8cd2de 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 67e0b9fb90..53e170a115 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 39a5178c7d..23459f2a91 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 78b39a2981..046e6abcad 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 77b0f7d86a..1302908bf7 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 bfadf196f9..4ae678181a 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 b18af50c9e..88975d8665 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 8484d591e5..3e52cda676 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)