diff options
author | Andrew den Exter <andrew.den-exter@nokia.com> | 2011-12-22 11:30:03 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-03 02:27:06 +0100 |
commit | c661cdc4fa8a3ba69c6b435f9d4916ad2ac7bf84 (patch) | |
tree | 09072612ef57c52bf3032f52746c74efa0a7b115 /tests/auto/qtquick2 | |
parent | 0f36211f84d8cf7d478c844ff48d1b618f7ae24f (diff) |
Fix test failures with shadow builds.
QFINDTESTDATA uses __FILE__ to determine the source directory, which
means it finds the wrong source directory when the macro is used from
a shared base class. Define the correct source directory in a pri
file and include that wherever QDeclarativeDataTest is used.
Change-Id: If3ef435f4bb3049733f49402338303c8b440f1fa
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests/auto/qtquick2')
34 files changed, 112 insertions, 112 deletions
diff --git a/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro index f5bebb3f49..d15e86cbd6 100644 --- a/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro +++ b/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro @@ -1,8 +1,8 @@ CONFIG += testcase TARGET = tst_qdeclarativeanimations -SOURCES += tst_qdeclarativeanimations.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativeanimations.cpp + +include (../../shared/util.pri) macx:CONFIG -= app_bundle diff --git a/tests/auto/qtquick2/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/qtquick2/qdeclarativebehaviors/qdeclarativebehaviors.pro index e68c68a96c..7089f1ce57 100644 --- a/tests/auto/qtquick2/qdeclarativebehaviors/qdeclarativebehaviors.pro +++ b/tests/auto/qtquick2/qdeclarativebehaviors/qdeclarativebehaviors.pro @@ -1,8 +1,8 @@ CONFIG += testcase TARGET = tst_qdeclarativebehaviors -SOURCES += tst_qdeclarativebehaviors.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativebehaviors.cpp + +include (../../shared/util.pri) macx:CONFIG -= app_bundle diff --git a/tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro index e257696cc2..0e84fc9dce 100644 --- a/tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro +++ b/tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro @@ -2,11 +2,11 @@ CONFIG += testcase TARGET = tst_qdeclarativefontloader macx:CONFIG -= app_bundle -HEADERS += ../../shared/testhttpserver.h \ - ../../shared/util.h +HEADERS += ../../shared/testhttpserver.h SOURCES += tst_qdeclarativefontloader.cpp \ - ../../shared/testhttpserver.cpp \ - ../../shared/util.cpp + ../../shared/testhttpserver.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qdeclarativepath/qdeclarativepath.pro b/tests/auto/qtquick2/qdeclarativepath/qdeclarativepath.pro index caadcbd728..1936d53050 100644 --- a/tests/auto/qtquick2/qdeclarativepath/qdeclarativepath.pro +++ b/tests/auto/qtquick2/qdeclarativepath/qdeclarativepath.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativepath macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativepath.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativepath.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qdeclarativepixmapcache/qdeclarativepixmapcache.pro b/tests/auto/qtquick2/qdeclarativepixmapcache/qdeclarativepixmapcache.pro index 1cc8149e85..0eb21af139 100644 --- a/tests/auto/qtquick2/qdeclarativepixmapcache/qdeclarativepixmapcache.pro +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/qdeclarativepixmapcache.pro @@ -3,12 +3,12 @@ TARGET = tst_qdeclarativepixmapcache macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepixmapcache.cpp \ - ../../shared/testhttpserver.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/testhttpserver.h \ - ../../shared/util.h + ../../shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h INCLUDEPATH += ../../shared/ +include (../../shared/util.pri) + importFiles.files = data importFiles.path = . DEPLOYMENT += importFiles diff --git a/tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro b/tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro index 044a7968f3..41650c523f 100644 --- a/tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro +++ b/tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativesmoothedanimation macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativesmoothedanimation.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativesmoothedanimation.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qdeclarativespringanimation/qdeclarativespringanimation.pro b/tests/auto/qtquick2/qdeclarativespringanimation/qdeclarativespringanimation.pro index 9c7000a247..d90cf3dca3 100644 --- a/tests/auto/qtquick2/qdeclarativespringanimation/qdeclarativespringanimation.pro +++ b/tests/auto/qtquick2/qdeclarativespringanimation/qdeclarativespringanimation.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativespringanimation macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativespringanimation.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativespringanimation.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qdeclarativestates/qdeclarativestates.pro b/tests/auto/qtquick2/qdeclarativestates/qdeclarativestates.pro index dbf7441d3b..74f5bef417 100644 --- a/tests/auto/qtquick2/qdeclarativestates/qdeclarativestates.pro +++ b/tests/auto/qtquick2/qdeclarativestates/qdeclarativestates.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativestates macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativestates.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativestates.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/qtquick2/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro index f5628fbd00..37f1c65c92 100644 --- a/tests/auto/qtquick2/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativexmllistmodel macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativexmllistmodel.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativexmllistmodel.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickanchors/qquickanchors.pro b/tests/auto/qtquick2/qquickanchors/qquickanchors.pro index 03b99e1dec..25711d4848 100644 --- a/tests/auto/qtquick2/qquickanchors/qquickanchors.pro +++ b/tests/auto/qtquick2/qquickanchors/qquickanchors.pro @@ -1,8 +1,8 @@ TARGET = tst_qquickanchors CONFIG += testcase -SOURCES += tst_qquickanchors.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickanchors.cpp + +include (../../shared/util.pri) macx:CONFIG -= app_bundle diff --git a/tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro b/tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro index c8c3bdb9f4..d776a73b21 100644 --- a/tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro +++ b/tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro @@ -1,10 +1,10 @@ CONFIG += testcase TARGET = tst_qquickanimatedimage -HEADERS += ../../shared/testhttpserver.h \ - ../../shared/util.h +HEADERS += ../../shared/testhttpserver.h SOURCES += tst_qquickanimatedimage.cpp \ - ../../shared/testhttpserver.cpp \ - ../../shared/util.cpp + ../../shared/testhttpserver.cpp + +include (../../shared/util.pri) macx:CONFIG -= app_bundle diff --git a/tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro b/tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro index 23c504df83..2073b4492f 100644 --- a/tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro +++ b/tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro @@ -2,11 +2,11 @@ CONFIG += testcase TARGET = tst_qquickborderimage macx:CONFIG -= app_bundle -HEADERS += ../../shared/testhttpserver.h \ - ../../shared/util.h +HEADERS += ../../shared/testhttpserver.h SOURCES += tst_qquickborderimage.cpp \ - ../../shared/testhttpserver.cpp \ - ../../shared/util.cpp + ../../shared/testhttpserver.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickcanvas/qquickcanvas.pro b/tests/auto/qtquick2/qquickcanvas/qquickcanvas.pro index 3aa38949bf..b21b492e0b 100644 --- a/tests/auto/qtquick2/qquickcanvas/qquickcanvas.pro +++ b/tests/auto/qtquick2/qquickcanvas/qquickcanvas.pro @@ -1,8 +1,8 @@ CONFIG += testcase TARGET = tst_qquickcanvas -SOURCES += tst_qquickcanvas.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickcanvas.cpp + +include (../../shared/util.pri) macx:CONFIG -= app_bundle diff --git a/tests/auto/qtquick2/qquickflickable/qquickflickable.pro b/tests/auto/qtquick2/qquickflickable/qquickflickable.pro index 6c2a2a6fc2..693913001a 100644 --- a/tests/auto/qtquick2/qquickflickable/qquickflickable.pro +++ b/tests/auto/qtquick2/qquickflickable/qquickflickable.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qquickflickable macx:CONFIG -= app_bundle -SOURCES += tst_qquickflickable.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickflickable.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickflipable/qquickflipable.pro b/tests/auto/qtquick2/qquickflipable/qquickflipable.pro index d1932fc3d5..3afad837fe 100644 --- a/tests/auto/qtquick2/qquickflipable/qquickflipable.pro +++ b/tests/auto/qtquick2/qquickflipable/qquickflipable.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qquickflipable macx:CONFIG -= app_bundle -SOURCES += tst_qquickflipable.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickflipable.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro b/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro index 1167643f46..75bd663405 100644 --- a/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro +++ b/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro @@ -1,8 +1,8 @@ CONFIG += testcase TARGET = tst_qquickfocusscope -SOURCES += tst_qquickfocusscope.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickfocusscope.cpp + +include (../../shared/util.pri) macx:CONFIG -= app_bundle diff --git a/tests/auto/qtquick2/qquickgridview/qquickgridview.pro b/tests/auto/qtquick2/qquickgridview/qquickgridview.pro index 32bf0ecaf9..ad026f0ad4 100644 --- a/tests/auto/qtquick2/qquickgridview/qquickgridview.pro +++ b/tests/auto/qtquick2/qquickgridview/qquickgridview.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qquickgridview macx:CONFIG -= app_bundle -SOURCES += tst_qquickgridview.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickgridview.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickimage/qquickimage.pro b/tests/auto/qtquick2/qquickimage/qquickimage.pro index 07dd5fe1e7..64a1a8f6c9 100644 --- a/tests/auto/qtquick2/qquickimage/qquickimage.pro +++ b/tests/auto/qtquick2/qquickimage/qquickimage.pro @@ -2,11 +2,11 @@ CONFIG += testcase TARGET = tst_qquickimage macx:CONFIG -= app_bundle -HEADERS += ../../shared/testhttpserver.h \ - ../../shared/util.h +HEADERS += ../../shared/testhttpserver.h SOURCES += tst_qquickimage.cpp \ - ../../shared/testhttpserver.cpp \ - ../../shared/util.cpp + ../../shared/testhttpserver.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickitem/qquickitem.pro b/tests/auto/qtquick2/qquickitem/qquickitem.pro index a29641c02b..70f6b15b3d 100644 --- a/tests/auto/qtquick2/qquickitem/qquickitem.pro +++ b/tests/auto/qtquick2/qquickitem/qquickitem.pro @@ -1,8 +1,8 @@ CONFIG += testcase TARGET = tst_qquickitem -SOURCES += tst_qquickitem.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickitem.cpp + +include (../../shared/util.pri) macx:CONFIG -= app_bundle diff --git a/tests/auto/qtquick2/qquickitem2/qquickitem2.pro b/tests/auto/qtquick2/qquickitem2/qquickitem2.pro index 75a6d88858..44d3ba37c8 100644 --- a/tests/auto/qtquick2/qquickitem2/qquickitem2.pro +++ b/tests/auto/qtquick2/qquickitem2/qquickitem2.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qquickitem2 macx:CONFIG -= app_bundle -SOURCES += tst_qquickitem.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickitem.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquicklistview/qquicklistview.pro b/tests/auto/qtquick2/qquicklistview/qquicklistview.pro index 16e0695855..8b05b74b7f 100644 --- a/tests/auto/qtquick2/qquicklistview/qquicklistview.pro +++ b/tests/auto/qtquick2/qquicklistview/qquicklistview.pro @@ -2,11 +2,11 @@ CONFIG += testcase TARGET = tst_qquicklistview macx:CONFIG -= app_bundle -HEADERS += incrementalmodel.h \ - ../../shared/util.h +HEADERS += incrementalmodel.h SOURCES += tst_qquicklistview.cpp \ - incrementalmodel.cpp \ - ../../shared/util.cpp + incrementalmodel.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickloader/qquickloader.pro b/tests/auto/qtquick2/qquickloader/qquickloader.pro index c22ed63b89..33c8c207af 100644 --- a/tests/auto/qtquick2/qquickloader/qquickloader.pro +++ b/tests/auto/qtquick2/qquickloader/qquickloader.pro @@ -3,12 +3,12 @@ TARGET = tst_qquickloader macx:CONFIG -= app_bundle INCLUDEPATH += ../../shared/ -HEADERS += ../../shared/testhttpserver.h \ - ../../shared/util.h +HEADERS += ../../shared/testhttpserver.h SOURCES += tst_qquickloader.cpp \ - ../../shared/testhttpserver.cpp \ - ../../shared/util.cpp + ../../shared/testhttpserver.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro b/tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro index cd1a44e91d..67d77dc05a 100644 --- a/tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro +++ b/tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro @@ -2,11 +2,11 @@ CONFIG += testcase TARGET = tst_qquickmousearea macx:CONFIG -= app_bundle -HEADERS += ../../shared/testhttpserver.h \ - ../../shared/util.h +HEADERS += ../../shared/testhttpserver.h SOURCES += tst_qquickmousearea.cpp \ - ../../shared/testhttpserver.cpp \ - ../../shared/util.cpp + ../../shared/testhttpserver.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickpathview/qquickpathview.pro b/tests/auto/qtquick2/qquickpathview/qquickpathview.pro index 7a414cd3ed..3d2a4ff91c 100644 --- a/tests/auto/qtquick2/qquickpathview/qquickpathview.pro +++ b/tests/auto/qtquick2/qquickpathview/qquickpathview.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qquickpathview macx:CONFIG -= app_bundle -SOURCES += tst_qquickpathview.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickpathview.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickpincharea/qquickpincharea.pro b/tests/auto/qtquick2/qquickpincharea/qquickpincharea.pro index f5fb246ae8..3c75079ca5 100644 --- a/tests/auto/qtquick2/qquickpincharea/qquickpincharea.pro +++ b/tests/auto/qtquick2/qquickpincharea/qquickpincharea.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qquickpincharea macx:CONFIG -= app_bundle -SOURCES += tst_qquickpincharea.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickpincharea.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickpositioners/qquickpositioners.pro b/tests/auto/qtquick2/qquickpositioners/qquickpositioners.pro index 729b61e80b..ec0056f8e9 100644 --- a/tests/auto/qtquick2/qquickpositioners/qquickpositioners.pro +++ b/tests/auto/qtquick2/qquickpositioners/qquickpositioners.pro @@ -1,8 +1,8 @@ CONFIG += testcase TARGET = tst_qquickpositioners -SOURCES += tst_qquickpositioners.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickpositioners.cpp + +include (../../shared/util.pri) macx:CONFIG -= app_bundle diff --git a/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro b/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro index efd7538099..fa1781fc44 100644 --- a/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro +++ b/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qquickrepeater macx:CONFIG -= app_bundle -SOURCES += tst_qquickrepeater.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickrepeater.cpp + +include (../../shared/util.pri) testFiles.files = data testFiles.path = . diff --git a/tests/auto/qtquick2/qquickscreen/qquickscreen.pro b/tests/auto/qtquick2/qquickscreen/qquickscreen.pro index 8d6a32b7aa..9e84512264 100644 --- a/tests/auto/qtquick2/qquickscreen/qquickscreen.pro +++ b/tests/auto/qtquick2/qquickscreen/qquickscreen.pro @@ -1,8 +1,8 @@ CONFIG += testcase TARGET = tst_qquickscreen -SOURCES += tst_qquickscreen.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickscreen.cpp + +include (../../shared/util.pri) macx:CONFIG -= app_bundle diff --git a/tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro b/tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro index 062a1b99cc..0d63007c65 100644 --- a/tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro +++ b/tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro @@ -1,8 +1,8 @@ CONFIG += testcase TARGET = tst_qquickspriteimage -SOURCES += tst_qquickspriteimage.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickspriteimage.cpp + +include (../../shared/util.pri) macx:CONFIG -= app_bundle diff --git a/tests/auto/qtquick2/qquicktext/qquicktext.pro b/tests/auto/qtquick2/qquicktext/qquicktext.pro index 5c55714605..b483bebc61 100644 --- a/tests/auto/qtquick2/qquicktext/qquicktext.pro +++ b/tests/auto/qtquick2/qquicktext/qquicktext.pro @@ -5,10 +5,10 @@ macx:CONFIG -= app_bundle SOURCES += tst_qquicktext.cpp INCLUDEPATH += ../../shared/ -HEADERS += ../../shared/testhttpserver.h \ - ../../shared/util.h -SOURCES += ../../shared/testhttpserver.cpp \ - ../../shared/util.cpp +HEADERS += ../../shared/testhttpserver.h +SOURCES += ../../shared/testhttpserver.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro b/tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro index b647377482..6f74761b7b 100644 --- a/tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro +++ b/tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro @@ -3,11 +3,11 @@ TARGET = tst_qquicktextedit macx:CONFIG -= app_bundle SOURCES += tst_qquicktextedit.cpp \ - ../../shared/testhttpserver.cpp \ - ../../shared/util.cpp + ../../shared/testhttpserver.cpp -HEADERS += ../../shared/testhttpserver.h \ - ../../shared/util.h +HEADERS += ../../shared/testhttpserver.h + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquicktextinput/qquicktextinput.pro b/tests/auto/qtquick2/qquicktextinput/qquicktextinput.pro index 3c21307f02..08ce675a03 100644 --- a/tests/auto/qtquick2/qquicktextinput/qquicktextinput.pro +++ b/tests/auto/qtquick2/qquicktextinput/qquicktextinput.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qquicktextinput macx:CONFIG -= app_bundle -SOURCES += tst_qquicktextinput.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquicktextinput.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickview/qquickview.pro b/tests/auto/qtquick2/qquickview/qquickview.pro index 90ad693eb0..c3bc0ddcaf 100644 --- a/tests/auto/qtquick2/qquickview/qquickview.pro +++ b/tests/auto/qtquick2/qquickview/qquickview.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qquickview macx:CONFIG -= app_bundle -SOURCES += tst_qquickview.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickview.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/qtquick2/qquickvisualdatamodel/qquickvisualdatamodel.pro b/tests/auto/qtquick2/qquickvisualdatamodel/qquickvisualdatamodel.pro index 3a194c54d6..26112cf659 100644 --- a/tests/auto/qtquick2/qquickvisualdatamodel/qquickvisualdatamodel.pro +++ b/tests/auto/qtquick2/qquickvisualdatamodel/qquickvisualdatamodel.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qquickvisualdatamodel macx:CONFIG -= app_bundle -SOURCES += tst_qquickvisualdatamodel.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qquickvisualdatamodel.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . |