diff options
Diffstat (limited to 'tests/auto/declarative')
27 files changed, 92 insertions, 93 deletions
diff --git a/tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro b/tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro index f51b1f3b35..5618995b4d 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro +++ b/tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro @@ -3,19 +3,18 @@ TARGET = tst_qdeclarativedebugjs QT += declarative-private testlib macx:CONFIG -= app_bundle -HEADERS += ../shared/debugutil_p.h \ - ../../../shared/util.h +HEADERS += ../shared/debugutil_p.h SOURCES += tst_qdeclarativedebugjs.cpp \ - ../shared/debugutil.cpp \ - ../../../shared/util.cpp + ../shared/debugutil.cpp INCLUDEPATH += ../shared +include (../../../shared/util.pri) + testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles - CONFIG += parallel_test OTHER_FILES += data/test.qml data/test.js \ diff --git a/tests/auto/declarative/debugger/qdeclarativedebugtrace/qdeclarativedebugtrace.pro b/tests/auto/declarative/debugger/qdeclarativedebugtrace/qdeclarativedebugtrace.pro index 112c8f015f..487c63aaca 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugtrace/qdeclarativedebugtrace.pro +++ b/tests/auto/declarative/debugger/qdeclarativedebugtrace/qdeclarativedebugtrace.pro @@ -2,15 +2,14 @@ CONFIG += testcase TARGET = tst_qdeclarativedebugtrace macx:CONFIG -= app_bundle -HEADERS += ../shared/debugutil_p.h \ - ../../../shared/util.h +HEADERS += ../shared/debugutil_p.h SOURCES += tst_qdeclarativedebugtrace.cpp \ - ../shared/debugutil.cpp \ - ../../../shared/util.cpp - + ../shared/debugutil.cpp OTHER_FILES += data/test.qml +include (../../../shared/util.pri) + CONFIG += parallel_test declarative_debug QT += declarative-private testlib diff --git a/tests/auto/declarative/debugger/qv8profilerservice/qv8profilerservice.pro b/tests/auto/declarative/debugger/qv8profilerservice/qv8profilerservice.pro index 6ef72350e9..eb57dff2fe 100644 --- a/tests/auto/declarative/debugger/qv8profilerservice/qv8profilerservice.pro +++ b/tests/auto/declarative/debugger/qv8profilerservice/qv8profilerservice.pro @@ -2,12 +2,12 @@ CONFIG += testcase TARGET = tst_qv8profilerservice macx:CONFIG -= app_bundle -HEADERS += ../shared/debugutil_p.h \ - ../../../shared/util.h +HEADERS += ../shared/debugutil_p.h SOURCES += tst_qv8profilerservice.cpp \ - ../shared/debugutil.cpp \ - ../../../shared/util.cpp + ../shared/debugutil.cpp + +include (../../../shared/util.pri) OTHER_FILES += data/test.qml diff --git a/tests/auto/declarative/qdeclarativeaccessibility/qdeclarativeaccessibility.pro b/tests/auto/declarative/qdeclarativeaccessibility/qdeclarativeaccessibility.pro index 8b5165687b..d7bf5ead52 100644 --- a/tests/auto/declarative/qdeclarativeaccessibility/qdeclarativeaccessibility.pro +++ b/tests/auto/declarative/qdeclarativeaccessibility/qdeclarativeaccessibility.pro @@ -2,11 +2,9 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative-private gui network qtquick1-private macx:CONFIG -= app_bundle -HEADERS += ../../shared/util.h - -SOURCES += tst_qdeclarativeaccessibility.cpp \ - ../../shared/util.cpp +SOURCES += tst_qdeclarativeaccessibility.cpp +include (../../shared/util.pri) OTHER_FILES += data/pushbutton.qml OTHER_FILES += data/statictext.qml diff --git a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro index 83163cdcff..6098d03509 100644 --- a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro +++ b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativebinding macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativebinding.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativebinding.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro index d04ef75f30..2389ca4a20 100644 --- a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro +++ b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativecomponent macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativecomponent.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativecomponent.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro index 6e48be9937..bb863c5262 100644 --- a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro +++ b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativeconnection macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativeconnection.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativeconnection.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativeconsole/qdeclarativeconsole.pro b/tests/auto/declarative/qdeclarativeconsole/qdeclarativeconsole.pro index b66866e7cc..0563491c1e 100644 --- a/tests/auto/declarative/qdeclarativeconsole/qdeclarativeconsole.pro +++ b/tests/auto/declarative/qdeclarativeconsole/qdeclarativeconsole.pro @@ -1,8 +1,9 @@ CONFIG += testcase TARGET = tst_qdeclarativeconsole -SOURCES += tst_qdeclarativeconsole.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativeconsole.cpp + +include (../../shared/util.pri) + macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro index b1a0384af7..3e1cc01e09 100644 --- a/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro +++ b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro @@ -1,8 +1,9 @@ CONFIG += testcase TARGET = tst_qdeclarativecontext -SOURCES += tst_qdeclarativecontext.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativecontext.cpp + +include (../../shared/util.pri) + macx:CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro index a8c8508891..f4c2638f95 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro +++ b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro @@ -4,13 +4,13 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeecmascript.cpp \ testtypes.cpp \ - ../../shared/testhttpserver.cpp \ - ../../shared/util.cpp + ../../shared/testhttpserver.cpp HEADERS += testtypes.h \ - ../../shared/testhttpserver.h \ - ../../shared/util.h + ../../shared/testhttpserver.h INCLUDEPATH += ../../shared +include (../../shared/util.pri) + # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage # LIBS += -lgcov diff --git a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro index 5d0bb98376..8acf46f7bc 100644 --- a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro +++ b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro @@ -1,8 +1,9 @@ CONFIG += testcase TARGET = tst_qdeclarativeerror -SOURCES += tst_qdeclarativeerror.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativeerror.cpp + +include (../../shared/util.pri) + macx:CONFIG -= app_bundle CONFIG += parallel_test diff --git a/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro b/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro index d9c2da603b..bd32e6a9ac 100644 --- a/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro +++ b/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativeexpression macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativeexpression.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativeexpression.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro index 5f337161b9..045d48a710 100644 --- a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro +++ b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativefolderlistmodel macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativefolderlistmodel.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativefolderlistmodel.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativeincubator/qdeclarativeincubator.pro b/tests/auto/declarative/qdeclarativeincubator/qdeclarativeincubator.pro index 947b16010b..90a6720bd7 100644 --- a/tests/auto/declarative/qdeclarativeincubator/qdeclarativeincubator.pro +++ b/tests/auto/declarative/qdeclarativeincubator/qdeclarativeincubator.pro @@ -3,11 +3,11 @@ TARGET = tst_qdeclarativeincubator macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeincubator.cpp \ - testtypes.cpp \ - ../../shared/util.cpp + testtypes.cpp -HEADERS += testtypes.h \ - ../../shared/util.h +HEADERS += testtypes.h + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro index 8d09720670..af4667184f 100644 --- a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro +++ b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativeinfo macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativeinfo.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativeinfo.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro index 460bbfea5e..25db0f9415 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro +++ b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativelistmodel macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativelistmodel.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativelistmodel.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro index 37778aab5b..7900f3c554 100644 --- a/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro +++ b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativelistreference macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativelistreference.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativelistreference.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativelocale/qdeclarativelocale.pro b/tests/auto/declarative/qdeclarativelocale/qdeclarativelocale.pro index c01bacf832..75ff0e9504 100644 --- a/tests/auto/declarative/qdeclarativelocale/qdeclarativelocale.pro +++ b/tests/auto/declarative/qdeclarativelocale/qdeclarativelocale.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativelocale macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativelocale.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativelocale.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro index 551d8eac5d..58f329d095 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro @@ -1,13 +1,13 @@ CONFIG += testcase TARGET = tst_qdeclarativemoduleplugin -HEADERS = ../../shared/testhttpserver.h \ - ../../shared/util.h +HEADERS = ../../shared/testhttpserver.h SOURCES = tst_qdeclarativemoduleplugin.cpp \ - ../../shared/testhttpserver.cpp \ - ../../shared/util.cpp + ../../shared/testhttpserver.cpp CONFIG -= app_bundle +include (../../shared/util.pri) + testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles diff --git a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro index bf81e1c357..45b240b9bd 100644 --- a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro +++ b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativeproperty macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativeproperty.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativeproperty.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro index 8b40936d9b..5ed808831c 100644 --- a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro +++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro @@ -1,8 +1,8 @@ CONFIG += testcase TARGET = tst_qdeclarativeqt -SOURCES += tst_qdeclarativeqt.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativeqt.cpp + +include (../../shared/util.pri) macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro index d3195df074..cc27d173ab 100644 --- a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro +++ b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativesqldatabase macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativesqldatabase.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativesqldatabase.cpp + +include (../../shared/util.pri) CONFIG += parallel_test diff --git a/tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro b/tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro index 5b40df8898..d6f067e440 100644 --- a/tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro +++ b/tests/auto/declarative/qdeclarativetranslation/qdeclarativetranslation.pro @@ -2,11 +2,11 @@ CONFIG += testcase TARGET = tst_qdeclarativetranslation macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativetranslation.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativetranslation.cpp RESOURCES += data/translation.qrc +include (../../shared/util.pri) + testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles diff --git a/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro index a240f30684..2968c8812b 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro +++ b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro @@ -2,12 +2,12 @@ CONFIG += testcase TARGET = tst_qdeclarativevaluetypes macx:CONFIG -= app_bundle -HEADERS += testtypes.h \ - ../../shared/util.h +HEADERS += testtypes.h SOURCES += tst_qdeclarativevaluetypes.cpp \ - testtypes.cpp \ - ../../shared/util.cpp + testtypes.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro index 584bcd672f..9e5cc43f20 100644 --- a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro +++ b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro @@ -2,9 +2,9 @@ CONFIG += testcase TARGET = tst_qdeclarativeworkerscript macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativeworkerscript.cpp \ - ../../shared/util.cpp -HEADERS += ../../shared/util.h +SOURCES += tst_qdeclarativeworkerscript.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro index fd6a19d6c2..b8f09f8722 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro @@ -3,12 +3,12 @@ TARGET = tst_qdeclarativexmlhttprequest macx:CONFIG -= app_bundle INCLUDEPATH += ../../shared/ -HEADERS += ../../shared/testhttpserver.h \ - ../../shared/util.h +HEADERS += ../../shared/testhttpserver.h SOURCES += tst_qdeclarativexmlhttprequest.cpp \ - ../../shared/testhttpserver.cpp \ - ../../shared/util.cpp + ../../shared/testhttpserver.cpp + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/v4/v4.pro b/tests/auto/declarative/v4/v4.pro index b14be36475..81d12f89be 100644 --- a/tests/auto/declarative/v4/v4.pro +++ b/tests/auto/declarative/v4/v4.pro @@ -3,10 +3,10 @@ TARGET = tst_qdeclarativev4 macx:CONFIG -= app_bundle SOURCES += tst_v4.cpp \ - testtypes.cpp \ - ../../shared/util.cpp -HEADERS += testtypes.h \ - ../../shared/util.h + testtypes.cpp +HEADERS += testtypes.h + +include (../../shared/util.pri) testDataFiles.files = data testDataFiles.path = . |