diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-10-25 14:42:16 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 08:42:23 +0200 |
| commit | d04bf8f4073aa50b23ae154250932b5ddd3ddc0a (patch) | |
| tree | 7a44d578fe0aa03facee96d75eaccbcedfc298fd /tests/auto | |
| parent | 6b29e881cdd93d8fccec50df9e8d001776800136 (diff) | |
all remaining tests: eliminated usage of qttest_p4.prf
qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.
Change-Id: I02fe27b2c1800f929250fa8694ca2976c9661a12
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto')
146 files changed, 340 insertions, 424 deletions
diff --git a/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro index 2816bcdcef..67e91216b6 100644 --- a/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro +++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro @@ -1,5 +1,5 @@ -CONFIG += qttest_p4 -QT += gui-private +CONFIG += testcase +QT += gui-private testlib include(../src/src.pri) win32: CONFIG += console diff --git a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro index 09ab7ac98f..d67d81e4bf 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro +++ b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core core-private +CONFIG += testcase +TARGET = tst_qdbusabstractadaptor +QT = core core-private testlib TEMPLATE = subdirs CONFIG += ordered SUBDIRS = qmyserver test diff --git a/tests/auto/dbus/qdbusabstractadaptor/test/test.pro b/tests/auto/dbus/qdbusabstractadaptor/test/test.pro index 52aa578fd4..e8943211c8 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/test/test.pro +++ b/tests/auto/dbus/qdbusabstractadaptor/test/test.pro @@ -1,6 +1,6 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qdbusabstractadaptor.cpp HEADERS += ../myobject.h TARGET = ../tst_qdbusabstractadaptor -QT = core core-private dbus +QT = core core-private dbus testlib diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro index 05e0c51084..9d8d542b88 100644 --- a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro +++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qdbusabstractinterface TEMPLATE = subdirs CONFIG += ordered SUBDIRS = qpinger test diff --git a/tests/auto/dbus/qdbusabstractinterface/test/test.pro b/tests/auto/dbus/qdbusabstractinterface/test/test.pro index 98bcaa70f5..aba7f57b20 100644 --- a/tests/auto/dbus/qdbusabstractinterface/test/test.pro +++ b/tests/auto/dbus/qdbusabstractinterface/test/test.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qdbusabstractinterface.cpp ../interface.cpp HEADERS += ../interface.h @@ -9,5 +9,5 @@ HEADERS += ../pinger.h TARGET = ../tst_qdbusabstractinterface -QT = core +QT = core testlib QT += dbus diff --git a/tests/auto/dbus/qdbusconnection/qdbusconnection.pro b/tests/auto/dbus/qdbusconnection/qdbusconnection.pro index cbc7a979eb..8c729aaf33 100644 --- a/tests/auto/dbus/qdbusconnection/qdbusconnection.pro +++ b/tests/auto/dbus/qdbusconnection/qdbusconnection.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbusconnection +QT = core dbus testlib SOURCES += tst_qdbusconnection.cpp diff --git a/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro b/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro index 2eae2e045b..97d3c0ebf4 100644 --- a/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro +++ b/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbusconnection_no_bus +QT = core dbus testlib SOURCES += tst_qdbusconnection_no_bus.cpp diff --git a/tests/auto/dbus/qdbuscontext/qdbuscontext.pro b/tests/auto/dbus/qdbuscontext/qdbuscontext.pro index 23fc22f440..4eb8cd9135 100644 --- a/tests/auto/dbus/qdbuscontext/qdbuscontext.pro +++ b/tests/auto/dbus/qdbuscontext/qdbuscontext.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbuscontext +QT = core dbus testlib SOURCES += tst_qdbuscontext.cpp diff --git a/tests/auto/dbus/qdbusinterface/qdbusinterface.pro b/tests/auto/dbus/qdbusinterface/qdbusinterface.pro index 8992828009..093a888765 100644 --- a/tests/auto/dbus/qdbusinterface/qdbusinterface.pro +++ b/tests/auto/dbus/qdbusinterface/qdbusinterface.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qdbusinterface +QT = core testlib TEMPLATE = subdirs CONFIG += ordered SUBDIRS = qmyserver test diff --git a/tests/auto/dbus/qdbusinterface/test/test.pro b/tests/auto/dbus/qdbusinterface/test/test.pro index 2ef7a89c56..15af258e3a 100644 --- a/tests/auto/dbus/qdbusinterface/test/test.pro +++ b/tests/auto/dbus/qdbusinterface/test/test.pro @@ -1,6 +1,6 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qdbusinterface.cpp HEADERS += ../myobject.h TARGET = ../tst_qdbusinterface -QT = core core-private dbus +QT = core core-private dbus testlib diff --git a/tests/auto/dbus/qdbuslocalcalls/qdbuslocalcalls.pro b/tests/auto/dbus/qdbuslocalcalls/qdbuslocalcalls.pro index 3375bb53a6..3577210b86 100644 --- a/tests/auto/dbus/qdbuslocalcalls/qdbuslocalcalls.pro +++ b/tests/auto/dbus/qdbuslocalcalls/qdbuslocalcalls.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbuslocalcalls +QT = core dbus testlib SOURCES += tst_qdbuslocalcalls.cpp diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro b/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro index dc2145aba2..0578433d58 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qdbusmarshall TEMPLATE = subdirs CONFIG += ordered SUBDIRS = qpong test -QT += core-private +QT += core-private testlib requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/dbus/qdbusmarshall/test/test.pro b/tests/auto/dbus/qdbusmarshall/test/test.pro index ba4d99b57d..e4d1c6b8dd 100644 --- a/tests/auto/dbus/qdbusmarshall/test/test.pro +++ b/tests/auto/dbus/qdbusmarshall/test/test.pro @@ -1,9 +1,8 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qdbusmarshall.cpp TARGET = ../tst_qdbusmarshall -QT = core -QT += core-private dbus-private +QT = core-private dbus-private testlib LIBS += $$QT_LIBS_DBUS QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS diff --git a/tests/auto/dbus/qdbusmetaobject/qdbusmetaobject.pro b/tests/auto/dbus/qdbusmetaobject/qdbusmetaobject.pro index c2dec0993c..12f801613d 100644 --- a/tests/auto/dbus/qdbusmetaobject/qdbusmetaobject.pro +++ b/tests/auto/dbus/qdbusmetaobject/qdbusmetaobject.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus-private +CONFIG += testcase +TARGET = tst_qdbusmetaobject +QT = core dbus-private testlib SOURCES += tst_qdbusmetaobject.cpp diff --git a/tests/auto/dbus/qdbusmetatype/qdbusmetatype.pro b/tests/auto/dbus/qdbusmetatype/qdbusmetatype.pro index 15b97de70c..38d7370667 100644 --- a/tests/auto/dbus/qdbusmetatype/qdbusmetatype.pro +++ b/tests/auto/dbus/qdbusmetatype/qdbusmetatype.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbusmetatype +QT = core dbus testlib SOURCES += tst_qdbusmetatype.cpp diff --git a/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro b/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro index aff27e5cb3..799df6e995 100644 --- a/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro +++ b/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbuspendingcall +QT = core dbus testlib SOURCES += tst_qdbuspendingcall.cpp CONFIG+=insignificant_test diff --git a/tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro b/tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro index 9eca779290..814e40decc 100644 --- a/tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro +++ b/tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbuspendingreply +QT = core dbus testlib SOURCES += tst_qdbuspendingreply.cpp diff --git a/tests/auto/dbus/qdbusreply/qdbusreply.pro b/tests/auto/dbus/qdbusreply/qdbusreply.pro index 492a3a7bc4..42e9e6dddc 100644 --- a/tests/auto/dbus/qdbusreply/qdbusreply.pro +++ b/tests/auto/dbus/qdbusreply/qdbusreply.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbusreply +QT = core dbus testlib SOURCES += tst_qdbusreply.cpp diff --git a/tests/auto/dbus/qdbusservicewatcher/qdbusservicewatcher.pro b/tests/auto/dbus/qdbusservicewatcher/qdbusservicewatcher.pro index 51f5f90687..e689a5cfa3 100644 --- a/tests/auto/dbus/qdbusservicewatcher/qdbusservicewatcher.pro +++ b/tests/auto/dbus/qdbusservicewatcher/qdbusservicewatcher.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbusservicewatcher +QT = core dbus testlib SOURCES += tst_qdbusservicewatcher.cpp diff --git a/tests/auto/dbus/qdbusthreading/qdbusthreading.pro b/tests/auto/dbus/qdbusthreading/qdbusthreading.pro index f8f319d960..95358b2003 100644 --- a/tests/auto/dbus/qdbusthreading/qdbusthreading.pro +++ b/tests/auto/dbus/qdbusthreading/qdbusthreading.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbusthreading +QT = core dbus testlib SOURCES += tst_qdbusthreading.cpp diff --git a/tests/auto/dbus/qdbustype/qdbustype.pro b/tests/auto/dbus/qdbustype/qdbustype.pro index 1ae84384b7..df114d9f44 100644 --- a/tests/auto/dbus/qdbustype/qdbustype.pro +++ b/tests/auto/dbus/qdbustype/qdbustype.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core-private dbus-private +CONFIG += testcase +TARGET = tst_qdbustype +QT = core-private dbus-private testlib SOURCES += tst_qdbustype.cpp QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS LIBS_PRIVATE += $$QT_LIBS_DBUS diff --git a/tests/auto/dbus/qdbusxmlparser/qdbusxmlparser.pro b/tests/auto/dbus/qdbusxmlparser/qdbusxmlparser.pro index da95823168..ac168bdf76 100644 --- a/tests/auto/dbus/qdbusxmlparser/qdbusxmlparser.pro +++ b/tests/auto/dbus/qdbusxmlparser/qdbusxmlparser.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core-private dbus-private +CONFIG += testcase +TARGET = tst_qdbusxmlparser +QT = core-private dbus-private testlib SOURCES += tst_qdbusxmlparser.cpp diff --git a/tests/auto/integrationtests/collections/collections.pro b/tests/auto/integrationtests/collections/collections.pro index 8601ff877d..364ae21858 100644 --- a/tests/auto/integrationtests/collections/collections.pro +++ b/tests/auto/integrationtests/collections/collections.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_collections SOURCES += tst_collections.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/integrationtests/exceptionsafety/exceptionsafety.pro b/tests/auto/integrationtests/exceptionsafety/exceptionsafety.pro index 52ba9e27bd..66abe49758 100644 --- a/tests/auto/integrationtests/exceptionsafety/exceptionsafety.pro +++ b/tests/auto/integrationtests/exceptionsafety/exceptionsafety.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_exceptionsafety SOURCES += tst_exceptionsafety.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/integrationtests/exceptionsafety_objects/exceptionsafety_objects.pro b/tests/auto/integrationtests/exceptionsafety_objects/exceptionsafety_objects.pro index d09c349215..3039a11706 100644 --- a/tests/auto/integrationtests/exceptionsafety_objects/exceptionsafety_objects.pro +++ b/tests/auto/integrationtests/exceptionsafety_objects/exceptionsafety_objects.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_exceptionsafety_objects +QT += widgets testlib HEADERS += oomsimulator.h 3rdparty/valgrind.h 3rdparty/memcheck.h SOURCES += tst_exceptionsafety_objects.cpp diff --git a/tests/auto/integrationtests/gestures/gestures.pro b/tests/auto/integrationtests/gestures/gestures.pro index 43ae4a3fa1..0642a1a68a 100644 --- a/tests/auto/integrationtests/gestures/gestures.pro +++ b/tests/auto/integrationtests/gestures/gestures.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_gestures +QT += widgets testlib SOURCES += tst_gestures.cpp CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/integrationtests/lancelot/lancelot.pro b/tests/auto/integrationtests/lancelot/lancelot.pro index d34732e06e..bbb48c745e 100644 --- a/tests/auto/integrationtests/lancelot/lancelot.pro +++ b/tests/auto/integrationtests/lancelot/lancelot.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += xml widgets +CONFIG += testcase +TARGET = tst_lancelot +QT += xml widgets testlib contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl SOURCES += tst_lancelot.cpp \ diff --git a/tests/auto/integrationtests/languagechange/languagechange.pro b/tests/auto/integrationtests/languagechange/languagechange.pro index c51c42ebe1..541a2f05fd 100644 --- a/tests/auto/integrationtests/languagechange/languagechange.pro +++ b/tests/auto/integrationtests/languagechange/languagechange.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets core-private +CONFIG += testcase +TARGET = tst_languagechange +QT += widgets core-private testlib SOURCES += tst_languagechange.cpp CONFIG += insignificant_test # QTBUG-21402 diff --git a/tests/auto/integrationtests/macgui/macgui.pro b/tests/auto/integrationtests/macgui/macgui.pro index 3fbe74f7c8..9d77731358 100644 --- a/tests/auto/integrationtests/macgui/macgui.pro +++ b/tests/auto/integrationtests/macgui/macgui.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_macgui TEMPLATE = app DEPENDPATH += . INCLUDEPATH += . @@ -7,7 +8,7 @@ INCLUDEPATH += . SOURCES += tst_macgui.cpp guitest.cpp HEADERS += guitest.h -QT = core-private gui-private widgets +QT = core-private gui-private widgets testlib requires(mac) diff --git a/tests/auto/integrationtests/macnativeevents/macnativeevents.pro b/tests/auto/integrationtests/macnativeevents/macnativeevents.pro index 0a0f6c8743..d52a99dcba 100644 --- a/tests/auto/integrationtests/macnativeevents/macnativeevents.pro +++ b/tests/auto/integrationtests/macnativeevents/macnativeevents.pro @@ -2,12 +2,13 @@ # Automatically generated by qmake (2.01a) Wed Nov 29 22:24:47 2006 ###################################################################### -load(qttest_p4) +CONFIG += testcase +TARGET = tst_macnativeevents TEMPLATE = app DEPENDPATH += . INCLUDEPATH += . LIBS += -framework Carbon -QT += widgets +QT += widgets testlib HEADERS += qnativeevents.h nativeeventlist.h expectedeventlist.h SOURCES += qnativeevents.cpp qnativeevents_mac.cpp SOURCES += expectedeventlist.cpp nativeeventlist.cpp diff --git a/tests/auto/integrationtests/macplist/test/test.pro b/tests/auto/integrationtests/macplist/test/test.pro index 4751b47e00..1f75e5fc78 100644 --- a/tests/auto/integrationtests/macplist/test/test.pro +++ b/tests/auto/integrationtests/macplist/test/test.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_macplist.cpp TARGET = ../tst_macplist diff --git a/tests/auto/integrationtests/modeltest/modeltest.pro b/tests/auto/integrationtests/modeltest/modeltest.pro index d4a8ba971d..b29fb862c7 100644 --- a/tests/auto/integrationtests/modeltest/modeltest.pro +++ b/tests/auto/integrationtests/modeltest/modeltest.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_modeltest +QT += widgets testlib SOURCES += tst_modeltest.cpp modeltest.cpp dynamictreemodel.cpp HEADERS += modeltest.h dynamictreemodel.h diff --git a/tests/auto/integrationtests/networkselftest/networkselftest.pro b/tests/auto/integrationtests/networkselftest/networkselftest.pro index 4440dc6cfd..3cd5f26689 100644 --- a/tests/auto/integrationtests/networkselftest/networkselftest.pro +++ b/tests/auto/integrationtests/networkselftest/networkselftest.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_networkselftest SOURCES += tst_networkselftest.cpp -QT = core network +QT = core network testlib wince*: { addFiles.files = rfc3252.txt diff --git a/tests/auto/integrationtests/qaccessibility/qaccessibility.pro b/tests/auto/integrationtests/qaccessibility/qaccessibility.pro index ae046cc3c3..d75e1862eb 100644 --- a/tests/auto/integrationtests/qaccessibility/qaccessibility.pro +++ b/tests/auto/integrationtests/qaccessibility/qaccessibility.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qaccessibility requires(contains(QT_CONFIG,accessibility)) -QT += widgets +QT += widgets testlib SOURCES += tst_qaccessibility.cpp unix:!mac:LIBS+=-lm diff --git a/tests/auto/integrationtests/qcomplextext/qcomplextext.pro b/tests/auto/integrationtests/qcomplextext/qcomplextext.pro index e04ebcbc69..ccea018c64 100644 --- a/tests/auto/integrationtests/qcomplextext/qcomplextext.pro +++ b/tests/auto/integrationtests/qcomplextext/qcomplextext.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets widgets-private +CONFIG += testcase +TARGET = tst_qcomplextext +QT += widgets widgets-private testlib QT += core-private gui-private SOURCES += tst_qcomplextext.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src diff --git a/tests/auto/integrationtests/qdirectpainter/runDirectPainter/runDirectPainter.pro b/tests/auto/integrationtests/qdirectpainter/runDirectPainter/runDirectPainter.pro index 09524e90c3..5b70dc6b7b 100644 --- a/tests/auto/integrationtests/qdirectpainter/runDirectPainter/runDirectPainter.pro +++ b/tests/auto/integrationtests/qdirectpainter/runDirectPainter/runDirectPainter.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +QT += testlib SOURCES = main.cpp TARGET = runDirectPainter diff --git a/tests/auto/integrationtests/qdirectpainter/test/test.pro b/tests/auto/integrationtests/qdirectpainter/test/test.pro index 3621e11fa9..1f6813670d 100644 --- a/tests/auto/integrationtests/qdirectpainter/test/test.pro +++ b/tests/auto/integrationtests/qdirectpainter/test/test.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +QT += widgets testlib SOURCES += ../tst_qdirectpainter.cpp TARGET = ../tst_qdirectpainter diff --git a/tests/auto/integrationtests/qfocusevent/qfocusevent.pro b/tests/auto/integrationtests/qfocusevent/qfocusevent.pro index d904a0b0bf..5f799291c6 100644 --- a/tests/auto/integrationtests/qfocusevent/qfocusevent.pro +++ b/tests/auto/integrationtests/qfocusevent/qfocusevent.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qfocusevent +QT += widgets testlib SOURCES += tst_qfocusevent.cpp diff --git a/tests/auto/integrationtests/qmultiscreen/qmultiscreen.pro b/tests/auto/integrationtests/qmultiscreen/qmultiscreen.pro index c4a983c5be..28373823bf 100644 --- a/tests/auto/integrationtests/qmultiscreen/qmultiscreen.pro +++ b/tests/auto/integrationtests/qmultiscreen/qmultiscreen.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qmultiscreen +QT += widgets testlib SOURCES += tst_qmultiscreen.cpp requires(embedded) diff --git a/tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro b/tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro index 9e3fcf28ba..b03a448dfb 100644 --- a/tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro +++ b/tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro @@ -1,3 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkaccessmanager_and_qprogressdialog SOURCES += tst_qnetworkaccessmanager_and_qprogressdialog.cpp -QT += network widgets +QT += network widgets testlib diff --git a/tests/auto/integrationtests/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro b/tests/auto/integrationtests/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro index c947e7a246..722f575f80 100644 --- a/tests/auto/integrationtests/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro +++ b/tests/auto/integrationtests/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro @@ -1,4 +1,5 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qsharedpointer_and_qwidget +QT += widgets testlib SOURCES += tst_qsharedpointer_and_qwidget.cpp DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/integrationtests/windowsmobile/test/test.pro b/tests/auto/integrationtests/windowsmobile/test/test.pro index 595a619d2a..36dd15f60e 100644 --- a/tests/auto/integrationtests/windowsmobile/test/test.pro +++ b/tests/auto/integrationtests/windowsmobile/test/test.pro @@ -1,6 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +QT += widgets testlib HEADERS += ddhelper.h SOURCES += tst_windowsmobile.cpp ddhelper.cpp RESOURCES += windowsmobile.qrc diff --git a/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro index 8e44eae43b..719c34f286 100644 --- a/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro +++ b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += network +CONFIG += testcase +TARGET = tst_qabstractnetworkcache +QT += network testlib QT -= gui SOURCES += tst_qabstractnetworkcache.cpp diff --git a/tests/auto/network/access/qftp/qftp.pro b/tests/auto/network/access/qftp/qftp.pro index 2aa80b346b..0f5bd5fe17 100644 --- a/tests/auto/network/access/qftp/qftp.pro +++ b/tests/auto/network/access/qftp/qftp.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qftp SOURCES += tst_qftp.cpp -QT = core network network-private +QT = core network network-private testlib wince*: { addFiles.files = rfc3252.txt diff --git a/tests/auto/network/access/qhttp/qhttp.pro b/tests/auto/network/access/qhttp/qhttp.pro index 81a67caab3..d25b321851 100644 --- a/tests/auto/network/access/qhttp/qhttp.pro +++ b/tests/auto/network/access/qhttp/qhttp.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qhttp SOURCES += tst_qhttp.cpp -QT = core network +QT = core network testlib wince*: { webFiles.files = webserver/* diff --git a/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro index 2a4c737c53..5a72350d63 100644 --- a/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro +++ b/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qhttpnetworkconnection SOURCES += tst_qhttpnetworkconnection.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib requires(contains(QT_CONFIG,private_tests)) -QT = core-private network-private +QT = core-private network-private testlib CONFIG+=insignificant_test # QTBUG-20981, crashes sometimes diff --git a/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro b/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro index 5c61de3101..786cc50ba5 100644 --- a/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro +++ b/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qhttpnetworkreply SOURCES += tst_qhttpnetworkreply.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib requires(contains(QT_CONFIG,private_tests)) -QT = core-private network-private +QT = core-private network-private testlib diff --git a/tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro b/tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro index 6869afeb79..e84f9f7dba 100644 --- a/tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro +++ b/tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro @@ -1,3 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkaccessmanager SOURCES += tst_qnetworkaccessmanager.cpp -QT = core network +QT = core network testlib diff --git a/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro b/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro index eb57e3efe5..aad2c917aa 100644 --- a/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro +++ b/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkcachemetadata QT -= gui -QT += network +QT += network testlib SOURCES += tst_qnetworkcachemetadata.cpp diff --git a/tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro b/tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro index 95d8b6ea1f..320e3a81c5 100644 --- a/tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro +++ b/tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkcookie SOURCES += tst_qnetworkcookie.cpp -QT = core network +QT = core network testlib diff --git a/tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro b/tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro index 2aecebf071..4c955f38f0 100644 --- a/tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro +++ b/tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkcookiejar SOURCES += tst_qnetworkcookiejar.cpp -QT = core core-private network network-private +QT = core core-private network network-private testlib diff --git a/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro index c48699dc55..f1a75e7ed6 100644 --- a/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro +++ b/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkdiskcache QT -= gui -QT += network +QT += network testlib SOURCES += tst_qnetworkdiskcache.cpp diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro index b73cd34218..b836173620 100644 --- a/tests/auto/network/access/qnetworkreply/test/test.pro +++ b/tests/auto/network/access/qnetworkreply/test/test.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase QT -= gui SOURCES += ../tst_qnetworkreply.cpp TARGET = ../tst_qnetworkreply @@ -15,7 +15,7 @@ win32 { DEFINES += SRCDIR=\\\"$$PWD/..\\\" -QT = core-private network-private +QT = core-private network-private testlib RESOURCES += ../qnetworkreply.qrc wince* { diff --git a/tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro b/tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro index f576ba221f..c00c2c30a2 100644 --- a/tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro +++ b/tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkrequest SOURCES += tst_qnetworkrequest.cpp -QT = core network +QT = core network testlib diff --git a/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro index 8910fbc209..b01f8d380e 100644 --- a/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro +++ b/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkconfiguration SOURCES += tst_qnetworkconfiguration.cpp HEADERS += ../qbearertestcommon.h -QT = core network +QT = core network testlib maemo6|maemo5 { CONFIG += link_pkgconfig diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro b/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro index 8dfd3402bc..e7ff28ee63 100644 --- a/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro +++ b/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkconfigurationmanager SOURCES += tst_qnetworkconfigurationmanager.cpp HEADERS += ../qbearertestcommon.h -QT = core network +QT = core network testlib maemo6|maemo5 { CONFIG += link_pkgconfig diff --git a/tests/auto/network/bearer/qnetworksession/test/test.pro b/tests/auto/network/bearer/qnetworksession/test/test.pro index 97a6cdce5f..4b4f5c9c4e 100644 --- a/tests/auto/network/bearer/qnetworksession/test/test.pro +++ b/tests/auto/network/bearer/qnetworksession/test/test.pro @@ -1,8 +1,8 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += tst_qnetworksession.cpp HEADERS += ../../qbearertestcommon.h -QT = core network +QT = core network testlib TARGET = tst_qnetworksession CONFIG(debug_and_release) { diff --git a/tests/auto/network/kernel/qauthenticator/qauthenticator.pro b/tests/auto/network/kernel/qauthenticator/qauthenticator.pro index 8ddb13b0df..5e4759b690 100644 --- a/tests/auto/network/kernel/qauthenticator/qauthenticator.pro +++ b/tests/auto/network/kernel/qauthenticator/qauthenticator.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qauthenticator requires(contains(QT_CONFIG,private_tests)) -QT = core network-private +QT = core network-private testlib SOURCES += tst_qauthenticator.cpp DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/network/kernel/qhostaddress/qhostaddress.pro b/tests/auto/network/kernel/qhostaddress/qhostaddress.pro index 4972b2e0f7..0880e8eaea 100644 --- a/tests/auto/network/kernel/qhostaddress/qhostaddress.pro +++ b/tests/auto/network/kernel/qhostaddress/qhostaddress.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qhostaddress SOURCES += tst_qhostaddress.cpp -QT = core network +QT = core network testlib win32: { wince*: { diff --git a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro index 8e79ec618d..aceedc1ee4 100644 --- a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro +++ b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qhostinfo SOURCES += tst_qhostinfo.cpp -QT = core-private network-private +QT = core-private network-private testlib wince*: { LIBS += ws2.lib diff --git a/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro b/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro index 8feb95fbab..427f2e0f19 100644 --- a/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro +++ b/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkaddressentry SOURCES += tst_qnetworkaddressentry.cpp -QT = core network +QT = core network testlib diff --git a/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro b/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro index aad1a10025..694dec2ed7 100644 --- a/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro +++ b/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkinterface SOURCES += tst_qnetworkinterface.cpp -QT = core network +QT = core network testlib diff --git a/tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro b/tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro index c8f379bb6d..996f9e3691 100644 --- a/tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro +++ b/tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro @@ -2,7 +2,8 @@ # Project file for autotest for file qnetworkproxy.h ############################################################ -load(qttest_p4) -QT = core network +CONFIG += testcase +TARGET = tst_qnetworkproxy +QT = core network testlib SOURCES += tst_qnetworkproxy.cpp diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro b/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro index 3307ee38ef..ed73e3e10e 100644 --- a/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro +++ b/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro @@ -2,7 +2,8 @@ # Project file for autotest for file qnetworkproxy.h (proxy factory part) ############################################################ -load(qttest_p4) -QT = core network +CONFIG += testcase +TARGET = tst_qnetworkproxyfactory +QT = core network testlib SOURCES += tst_qnetworkproxyfactory.cpp diff --git a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro index bcec77fed2..eee762037d 100644 --- a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro +++ b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_platformsocketengine SOURCES += tst_platformsocketengine.cpp include(../platformsocketengine/platformsocketengine.pri) @@ -7,4 +8,4 @@ requires(contains(QT_CONFIG,private_tests)) MOC_DIR=tmp -QT = core-private network-private +QT = core-private network-private testlib diff --git a/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro b/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro index 2066d69238..00e604972f 100644 --- a/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro +++ b/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro @@ -2,8 +2,9 @@ # Project file for autotest for file qabstractsocket.h ############################################################ -load(qttest_p4) -QT = core network +CONFIG += testcase +TARGET = tst_qabstractsocket +QT = core network testlib SOURCES += tst_qabstractsocket.cpp diff --git a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro index cc0afb441d..d0649410fa 100644 --- a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro +++ b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qhttpsocketengine SOURCES += tst_qhttpsocketengine.cpp @@ -6,5 +7,5 @@ include(../platformsocketengine/platformsocketengine.pri) MOC_DIR=tmp -QT = core-private network-private +QT = core-private network-private testlib diff --git a/tests/auto/network/socket/qlocalsocket/test/test.pro b/tests/auto/network/socket/qlocalsocket/test/test.pro index f8d993bf91..90524958e1 100644 --- a/tests/auto/network/socket/qlocalsocket/test/test.pro +++ b/tests/auto/network/socket/qlocalsocket/test/test.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase DEFINES += QLOCALSERVER_DEBUG DEFINES += QLOCALSOCKET_DEBUG @@ -10,7 +10,7 @@ wince* { DEFINES += SRCDIR=\\\"$$PWD/../\\\" } -QT = core network +QT = core network testlib SOURCES += ../tst_qlocalsocket.cpp diff --git a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro index bec8eb8795..f3c24e19fd 100644 --- a/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro +++ b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsocks5socketengine SOURCES += tst_qsocks5socketengine.cpp @@ -7,6 +8,6 @@ include(../platformsocketengine/platformsocketengine.pri) MOC_DIR=tmp -QT = core-private network-private +QT = core-private network-private testlib requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/network/socket/qtcpserver/test/test.pro b/tests/auto/network/socket/qtcpserver/test/test.pro index 7cac14e645..be0ac1f384 100644 --- a/tests/auto/network/socket/qtcpserver/test/test.pro +++ b/tests/auto/network/socket/qtcpserver/test/test.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qtcpserver.cpp win32: { @@ -22,7 +22,7 @@ win32 { } } -QT = core network +QT = core network testlib MOC_DIR=tmp diff --git a/tests/auto/network/socket/qtcpsocket/test/test.pro b/tests/auto/network/socket/qtcpsocket/test/test.pro index 41ef18a4d8..13c39471b3 100644 --- a/tests/auto/network/socket/qtcpsocket/test/test.pro +++ b/tests/auto/network/socket/qtcpsocket/test/test.pro @@ -1,6 +1,6 @@ -load(qttest_p4) +CONFIG += testcase -QT += widgets +QT += widgets testlib QT += core-private network-private SOURCES += ../tst_qtcpsocket.cpp win32: { diff --git a/tests/auto/network/socket/qudpsocket/test/test.pro b/tests/auto/network/socket/qudpsocket/test/test.pro index 2bc074d9f6..6ff5dca813 100644 --- a/tests/auto/network/socket/qudpsocket/test/test.pro +++ b/tests/auto/network/socket/qudpsocket/test/test.pro @@ -1,6 +1,6 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qudpsocket.cpp -QT = core network +QT = core network testlib MOC_DIR=tmp diff --git a/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro b/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro index 36b7b7bc57..7e2abac3f8 100644 --- a/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro +++ b/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro @@ -1,8 +1,8 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += tst_qsslcertificate.cpp !wince*:win32:LIBS += -lws2_32 -QT = core network +QT = core network testlib TARGET = tst_qsslcertificate diff --git a/tests/auto/network/ssl/qsslcipher/qsslcipher.pro b/tests/auto/network/ssl/qsslcipher/qsslcipher.pro index 77c3f10d3e..541c5cbc0c 100644 --- a/tests/auto/network/ssl/qsslcipher/qsslcipher.pro +++ b/tests/auto/network/ssl/qsslcipher/qsslcipher.pro @@ -1,8 +1,8 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += tst_qsslcipher.cpp !wince*:win32:LIBS += -lws2_32 -QT = core network +QT = core network testlib TARGET = tst_qsslcipher diff --git a/tests/auto/network/ssl/qsslerror/qsslerror.pro b/tests/auto/network/ssl/qsslerror/qsslerror.pro index d0abb966eb..06e9bfca02 100644 --- a/tests/auto/network/ssl/qsslerror/qsslerror.pro +++ b/tests/auto/network/ssl/qsslerror/qsslerror.pro @@ -1,8 +1,8 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += tst_qsslerror.cpp !wince*:win32:LIBS += -lws2_32 -QT = core network +QT = core network testlib TARGET = tst_qsslerror diff --git a/tests/auto/network/ssl/qsslkey/qsslkey.pro b/tests/auto/network/ssl/qsslkey/qsslkey.pro index f21544ac51..d882362290 100644 --- a/tests/auto/network/ssl/qsslkey/qsslkey.pro +++ b/tests/auto/network/ssl/qsslkey/qsslkey.pro @@ -1,8 +1,8 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += tst_qsslkey.cpp !wince*:win32:LIBS += -lws2_32 -QT = core network +QT = core network testlib TARGET = tst_qsslkey diff --git a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro index 5c0a0b5c74..afad96632a 100644 --- a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro +++ b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro @@ -1,8 +1,8 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += tst_qsslsocket.cpp !wince*:win32:LIBS += -lws2_32 -QT += core-private network-private +QT += core-private network-private testlib QT -= gui TARGET = tst_qsslsocket diff --git a/tests/auto/opengl/qgl/qgl.pro b/tests/auto/opengl/qgl/qgl.pro index c5e26451ed..963b2d7e55 100644 --- a/tests/auto/opengl/qgl/qgl.pro +++ b/tests/auto/opengl/qgl/qgl.pro @@ -2,9 +2,10 @@ # Project file for autotest for file qgl.h ############################################################ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qgl requires(contains(QT_CONFIG,opengl)) -QT += widgets widgets-private opengl-private gui-private core-private +QT += widgets widgets-private opengl-private gui-private core-private testlib contains(QT_CONFIG,egl):DEFINES += QGL_EGL win32:!wince*: DEFINES += QT_NO_EGL diff --git a/tests/auto/opengl/qglbuffer/qglbuffer.pro b/tests/auto/opengl/qglbuffer/qglbuffer.pro index 48bd966797..537f3c122a 100644 --- a/tests/auto/opengl/qglbuffer/qglbuffer.pro +++ b/tests/auto/opengl/qglbuffer/qglbuffer.pro @@ -2,9 +2,10 @@ # Project file for autotest for file qglbuffer.h ############################################################ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qglbuffer requires(contains(QT_CONFIG,opengl)) -QT += opengl widgets +QT += opengl widgets testlib win32:!wince*: DEFINES += QT_NO_EGL diff --git a/tests/auto/opengl/qglfunctions/qglfunctions.pro b/tests/auto/opengl/qglfunctions/qglfunctions.pro index 9fe8de2b23..4b7c8758a9 100644 --- a/tests/auto/opengl/qglfunctions/qglfunctions.pro +++ b/tests/auto/opengl/qglfunctions/qglfunctions.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qglfunctions requires(contains(QT_CONFIG,opengl)) -QT += opengl widgets +QT += opengl widgets testlib win32:!wince*: DEFINES += QT_NO_EGL diff --git a/tests/auto/opengl/qglthreads/qglthreads.pro b/tests/auto/opengl/qglthreads/qglthreads.pro index d2fd31411f..7adde09e93 100644 --- a/tests/auto/opengl/qglthreads/qglthreads.pro +++ b/tests/auto/opengl/qglthreads/qglthreads.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qglthreads requires(contains(QT_CONFIG,opengl)) -QT += opengl widgets +QT += opengl widgets testlib win32:!wince*: DEFINES += QT_NO_EGL diff --git a/tests/auto/other/atwrapper/atWrapper.pro b/tests/auto/other/atwrapper/atWrapper.pro index 323ca1bf5f..5dcbdb98ce 100644 --- a/tests/auto/other/atwrapper/atWrapper.pro +++ b/tests/auto/other/atwrapper/atWrapper.pro @@ -7,13 +7,13 @@ TEMPLATE = app INCLUDEPATH += $$ARTHUR DEFINES += SRCDIR=\\\"$$PWD\\\" -QT += xml svg network +QT += xml svg network testlib contains(QT_CONFIG, opengl):QT += opengl include($$ARTHUR/datagenerator/datagenerator.pri) -load(qttest_p4) +CONFIG += testcase # Input HEADERS += atWrapper.h diff --git a/tests/auto/other/compiler/compiler.pro b/tests/auto/other/compiler/compiler.pro index c444c63af6..e6307ac9ec 100644 --- a/tests/auto/other/compiler/compiler.pro +++ b/tests/auto/other/compiler/compiler.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_compiler SOURCES += tst_compiler.cpp baseclass.cpp derivedclass.cpp HEADERS += baseclass.h derivedclass.h -QT = core +QT = core testlib diff --git a/tests/auto/other/headersclean/headersclean.pro b/tests/auto/other/headersclean/headersclean.pro index 39cce8cde0..814f19c865 100644 --- a/tests/auto/other/headersclean/headersclean.pro +++ b/tests/auto/other/headersclean/headersclean.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_headersclean SOURCES += tst_headersclean.cpp -QT = core network xml sql +QT = core network xml sql testlib contains(QT_CONFIG,dbus): QT += dbus contains(QT_CONFIG,opengl): QT += opengl diff --git a/tests/auto/other/qtokenautomaton/qtokenautomaton.pro b/tests/auto/other/qtokenautomaton/qtokenautomaton.pro index 5e2e590a4b..a4af4bc1c5 100644 --- a/tests/auto/other/qtokenautomaton/qtokenautomaton.pro +++ b/tests/auto/other/qtokenautomaton/qtokenautomaton.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtokenautomaton SOURCES += tst_qtokenautomaton.cpp \ tokenizers/basic/basic.cpp \ tokenizers/basicNamespace/basicNamespace.cpp \ @@ -14,5 +15,5 @@ HEADERS += tokenizers/basic/basic.h \ tokenizers/noToString/noToString.h \ tokenizers/withNamespace/withNamespace.h -QT -= gui +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro b/tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro index e3566aa1ca..eb9810dd53 100644 --- a/tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro +++ b/tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmetaobjectbuilder macx:CONFIG -= app_bundle SOURCES += \ tst_qmetaobjectbuilder.cpp CONFIG += parallel_test -QT += core-private gui-private +QT += core-private gui-private testlib diff --git a/tests/auto/qobjectperformance/qobjectperformance.pro b/tests/auto/qobjectperformance/qobjectperformance.pro index 0b4c5ee541..189f8eeb2a 100644 --- a/tests/auto/qobjectperformance/qobjectperformance.pro +++ b/tests/auto/qobjectperformance/qobjectperformance.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qobjectperformance SOURCES += tst_qobjectperformance.cpp -QT = core network +QT = core network testlib diff --git a/tests/auto/qscreen/qscreen.pro b/tests/auto/qscreen/qscreen.pro index 25d730aae4..be3a89867d 100644 --- a/tests/auto/qscreen/qscreen.pro +++ b/tests/auto/qscreen/qscreen.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qscreen -QT += core-private gui-private +QT += core-private gui-private testlib SOURCES += tst_qscreen.cpp diff --git a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro index 9744a2e93b..33b55b4638 100644 --- a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro +++ b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro @@ -1,8 +1,8 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += tst_qsslsocket_onDemandCertificates_member.cpp !wince*:win32:LIBS += -lws2_32 -QT += core-private network-private +QT += core-private network-private testlib QT -= gui TARGET = tst_qsslsocket_onDemandCertificates_member diff --git a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro index facec513b1..8a500a3d99 100644 --- a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro +++ b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro @@ -1,8 +1,8 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += tst_qsslsocket_onDemandCertificates_static.cpp !wince*:win32:LIBS += -lws2_32 -QT += core-private network-private +QT += core-private network-private testlib QT -= gui TARGET = tst_qsslsocket_onDemandCertificates_static diff --git a/tests/auto/qwindow/qwindow.pro b/tests/auto/qwindow/qwindow.pro index 560945322c..9fb49e8ceb 100644 --- a/tests/auto/qwindow/qwindow.pro +++ b/tests/auto/qwindow/qwindow.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qwindow -QT += core-private gui-private +QT += core-private gui-private testlib SOURCES += tst_qwindow.cpp diff --git a/tests/auto/sql/kernel/qsql/qsql.pro b/tests/auto/sql/kernel/qsql/qsql.pro index e05329662b..ac21bb392c 100644 --- a/tests/auto/sql/kernel/qsql/qsql.pro +++ b/tests/auto/sql/kernel/qsql/qsql.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsql SOURCES += tst_qsql.cpp -QT += sql sql-private gui widgets +QT += sql sql-private gui widgets testlib wince*: { DEPLOYMENT_PLUGIN += qsqlite diff --git a/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro index 6e7e4bcaef..89dc7a5c7c 100644 --- a/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro +++ b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsqldatabase SOURCES += tst_qsqldatabase.cpp -QT = core sql +QT = core sql testlib win32: { !wince*: LIBS += -lws2_32 diff --git a/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro index 3e31c81558..9639d5cfae 100644 --- a/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro +++ b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsqldriver SOURCES += tst_qsqldriver.cpp -QT = core sql +QT = core sql testlib wince*: { plugFiles.files = ../../../plugins/sqldrivers diff --git a/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro b/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro index 208064a4c3..ef0d213dba 100644 --- a/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro +++ b/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro @@ -2,7 +2,8 @@ # Project file for autotest for file qsqlerror.h ############################################################ -load(qttest_p4) -QT = core sql +CONFIG += testcase +TARGET = tst_qsqlerror +QT = core sql testlib SOURCES += tst_qsqlerror.cpp diff --git a/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro b/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro index 2b1b3649c9..5e0f4afe4c 100644 --- a/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro +++ b/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsqlfield SOURCES += tst_qsqlfield.cpp -QT = core sql +QT = core sql testlib diff --git a/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro b/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro index 71e2a536b4..ee17b5f249 100644 --- a/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro +++ b/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsqlrecord SOURCES += tst_qsqlrecord.cpp -QT = core sql +QT = core sql testlib diff --git a/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro b/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro index ab3960c63b..73247545ce 100644 --- a/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro +++ b/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsqlthread SOURCES += tst_qsqlthread.cpp -QT = core sql +QT = core sql testlib wince*: { diff --git a/tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro b/tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro index db64e4ca2c..cbbd1d6eb7 100644 --- a/tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro +++ b/tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsqlquerymodel SOURCES += tst_qsqlquerymodel.cpp -QT += widgets sql +QT += widgets sql testlib wince*: { DEPLOYMENT_PLUGIN += qsqlite diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro b/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro index 30f487bc10..117ad5cbf6 100644 --- a/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro +++ b/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsqlrelationaltablemodel SOURCES += tst_qsqlrelationaltablemodel.cpp -QT = core sql +QT = core sql testlib wince*: { plugFiles.files = ../../../plugins/sqldrivers diff --git a/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro b/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro index 6eb59eb1ad..b8360b0517 100644 --- a/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro +++ b/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsqltablemodel SOURCES += tst_qsqltablemodel.cpp -QT = core sql +QT = core sql testlib wince*: { plugFiles.files = ../../../plugins/sqldrivers diff --git a/tests/auto/testlib/qsignalspy/qsignalspy.pro b/tests/auto/testlib/qsignalspy/qsignalspy.pro index d3ae63b5bc..72ae3a5009 100644 --- a/tests/auto/testlib/qsignalspy/qsignalspy.pro +++ b/tests/auto/testlib/qsignalspy/qsignalspy.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsignalspy SOURCES += tst_qsignalspy.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/testlib/selftests/alive/alive.pro b/tests/auto/testlib/selftests/alive/alive.pro index 7660933a58..d3df09b10d 100644 --- a/tests/auto/testlib/selftests/alive/alive.pro +++ b/tests/auto/testlib/selftests/alive/alive.pro @@ -1,9 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_alive.cpp +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/assert/assert.pro b/tests/auto/testlib/selftests/assert/assert.pro index a1ed578a31..cfc6a0c6b3 100644 --- a/tests/auto/testlib/selftests/assert/assert.pro +++ b/tests/auto/testlib/selftests/assert/assert.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_assert.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/badxml/badxml.pro b/tests/auto/testlib/selftests/badxml/badxml.pro index 126ac379d7..561c7e01db 100644 --- a/tests/auto/testlib/selftests/badxml/badxml.pro +++ b/tests/auto/testlib/selftests/badxml/badxml.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_badxml.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro b/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro index 50d056eae4..baa996c8d3 100644 --- a/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro +++ b/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_benchlibcallgrind.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro b/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro index de978672f1..d1fe909fa1 100644 --- a/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro +++ b/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_benchlibeventcounter.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro b/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro index 118563003f..73173b0a08 100644 --- a/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro +++ b/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_benchliboptions.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter.pro b/tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter.pro index b83ef441e1..ce0ec7012c 100644 --- a/tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter.pro +++ b/tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_benchlibtickcounter.cpp QT = core testlib-private diff --git a/tests/auto/testlib/selftests/benchlibwalltime/benchlibwalltime.pro b/tests/auto/testlib/selftests/benchlibwalltime/benchlibwalltime.pro index 83b383da87..0e689871ab 100644 --- a/tests/auto/testlib/selftests/benchlibwalltime/benchlibwalltime.pro +++ b/tests/auto/testlib/selftests/benchlibwalltime/benchlibwalltime.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_benchlibwalltime.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/cmptest/cmptest.pro b/tests/auto/testlib/selftests/cmptest/cmptest.pro index 9c14987205..ac392b0234 100644 --- a/tests/auto/testlib/selftests/cmptest/cmptest.pro +++ b/tests/auto/testlib/selftests/cmptest/cmptest.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_cmptest.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro b/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro index e10ec404b3..9dd1212eba 100644 --- a/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro +++ b/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_commandlinedata.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/crashes/crashes.pro b/tests/auto/testlib/selftests/crashes/crashes.pro index 8162e5ca0a..e9f0f3e5b7 100644 --- a/tests/auto/testlib/selftests/crashes/crashes.pro +++ b/tests/auto/testlib/selftests/crashes/crashes.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_crashes.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/datatable/datatable.pro b/tests/auto/testlib/selftests/datatable/datatable.pro index 865e00e7f1..7c36d4a911 100644 --- a/tests/auto/testlib/selftests/datatable/datatable.pro +++ b/tests/auto/testlib/selftests/datatable/datatable.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_datatable.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/datetime/datetime.pro b/tests/auto/testlib/selftests/datetime/datetime.pro index 34d6169538..f73a763d6b 100644 --- a/tests/auto/testlib/selftests/datetime/datetime.pro +++ b/tests/auto/testlib/selftests/datetime/datetime.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_datetime.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/differentexec/differentexec.pro b/tests/auto/testlib/selftests/differentexec/differentexec.pro index 84e20eec03..60000d12ea 100644 --- a/tests/auto/testlib/selftests/differentexec/differentexec.pro +++ b/tests/auto/testlib/selftests/differentexec/differentexec.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_differentexec.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro b/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro index 62c782f6be..4a72181a07 100644 --- a/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro +++ b/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_exceptionthrow.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/expectfail/expectfail.pro b/tests/auto/testlib/selftests/expectfail/expectfail.pro index 1e96018825..a2916b2830 100644 --- a/tests/auto/testlib/selftests/expectfail/expectfail.pro +++ b/tests/auto/testlib/selftests/expectfail/expectfail.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_expectfail.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/failinit/failinit.pro b/tests/auto/testlib/selftests/failinit/failinit.pro index 0eedd06427..9a781840c6 100644 --- a/tests/auto/testlib/selftests/failinit/failinit.pro +++ b/tests/auto/testlib/selftests/failinit/failinit.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_failinit.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/failinitdata/failinitdata.pro b/tests/auto/testlib/selftests/failinitdata/failinitdata.pro index 61f393771b..7b0b15a59b 100644 --- a/tests/auto/testlib/selftests/failinitdata/failinitdata.pro +++ b/tests/auto/testlib/selftests/failinitdata/failinitdata.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_failinitdata.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro b/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro index 9a5e095d0c..1f8652d533 100644 --- a/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro +++ b/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_fetchbogus.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/float/float.pro b/tests/auto/testlib/selftests/float/float.pro index 2c5ac3ebf7..95980eeac8 100644 --- a/tests/auto/testlib/selftests/float/float.pro +++ b/tests/auto/testlib/selftests/float/float.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_float.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/globaldata/globaldata.pro b/tests/auto/testlib/selftests/globaldata/globaldata.pro index 71a243f680..3d49d3515b 100644 --- a/tests/auto/testlib/selftests/globaldata/globaldata.pro +++ b/tests/auto/testlib/selftests/globaldata/globaldata.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_globaldata.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/longstring/longstring.pro b/tests/auto/testlib/selftests/longstring/longstring.pro index d496691e60..9b393e9cc7 100644 --- a/tests/auto/testlib/selftests/longstring/longstring.pro +++ b/tests/auto/testlib/selftests/longstring/longstring.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_longstring.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro b/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro index 42a122d02a..9ebdde5015 100644 --- a/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro +++ b/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += maxwarnings.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/multiexec/multiexec.pro b/tests/auto/testlib/selftests/multiexec/multiexec.pro index 5a3f5affaf..79ae010bcb 100644 --- a/tests/auto/testlib/selftests/multiexec/multiexec.pro +++ b/tests/auto/testlib/selftests/multiexec/multiexec.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_multiexec.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro b/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro index d994ceabf3..de8a7da37e 100644 --- a/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro +++ b/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_qexecstringlist.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/singleskip/singleskip.pro b/tests/auto/testlib/selftests/singleskip/singleskip.pro index 34a0f72568..f4bde92d62 100644 --- a/tests/auto/testlib/selftests/singleskip/singleskip.pro +++ b/tests/auto/testlib/selftests/singleskip/singleskip.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_singleskip.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/skip/skip.pro b/tests/auto/testlib/selftests/skip/skip.pro index 4f4b486ed4..82576212ad 100644 --- a/tests/auto/testlib/selftests/skip/skip.pro +++ b/tests/auto/testlib/selftests/skip/skip.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_skip.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/skipinit/skipinit.pro b/tests/auto/testlib/selftests/skipinit/skipinit.pro index 3d458f3669..848252eabd 100644 --- a/tests/auto/testlib/selftests/skipinit/skipinit.pro +++ b/tests/auto/testlib/selftests/skipinit/skipinit.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_skipinit.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro b/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro index 26119eb70c..762543a60b 100644 --- a/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro +++ b/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_skipinitdata.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/sleep/sleep.pro b/tests/auto/testlib/selftests/sleep/sleep.pro index d963e73ed2..e0ae72f54a 100644 --- a/tests/auto/testlib/selftests/sleep/sleep.pro +++ b/tests/auto/testlib/selftests/sleep/sleep.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_sleep.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/strcmp/strcmp.pro b/tests/auto/testlib/selftests/strcmp/strcmp.pro index 8cf1caa906..ac1f1e840e 100644 --- a/tests/auto/testlib/selftests/strcmp/strcmp.pro +++ b/tests/auto/testlib/selftests/strcmp/strcmp.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_strcmp.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/subtest/subtest.pro b/tests/auto/testlib/selftests/subtest/subtest.pro index ac237790d2..3066f20247 100644 --- a/tests/auto/testlib/selftests/subtest/subtest.pro +++ b/tests/auto/testlib/selftests/subtest/subtest.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_subtest.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/test/test.pro b/tests/auto/testlib/selftests/test/test.pro index 966fc5a412..29d2cc5f36 100644 --- a/tests/auto/testlib/selftests/test/test.pro +++ b/tests/auto/testlib/selftests/test/test.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_selftests.cpp QT = core xml testlib-private diff --git a/tests/auto/testlib/selftests/warnings/warnings.pro b/tests/auto/testlib/selftests/warnings/warnings.pro index 147d96a02f..0c6ca01588 100644 --- a/tests/auto/testlib/selftests/warnings/warnings.pro +++ b/tests/auto/testlib/selftests/warnings/warnings.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - SOURCES += tst_warnings.cpp -QT = core +QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/xunit/xunit.pro b/tests/auto/testlib/selftests/xunit/xunit.pro index d118fc0202..d3ae402e6f 100644 --- a/tests/auto/testlib/selftests/xunit/xunit.pro +++ b/tests/auto/testlib/selftests/xunit/xunit.pro @@ -1,9 +1,4 @@ -load(qttest_p4) -QT = core - -# this is not a real testcase ('make check' should not run it) -CONFIG -= testcase - +QT = core testlib SOURCES += tst_xunit.cpp mac:CONFIG -= app_bundle diff --git a/tests/auto/tools/moc/moc.pro b/tests/auto/tools/moc/moc.pro index 78f9aeed9a..37e33a12d1 100644 --- a/tests/auto/tools/moc/moc.pro +++ b/tests/auto/tools/moc/moc.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_moc #exists(/usr/include/boost/spirit.hpp) { # message("including boost headers in test") @@ -21,7 +22,7 @@ if(*-g++*|*-icc*|*-clang|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win SOURCES += tst_moc.cpp QT -= gui -QT += sql network +QT += sql network testlib contains(QT_CONFIG, dbus){ DEFINES += WITH_DBUS QT += dbus diff --git a/tests/auto/tools/qmake/qmake.pro b/tests/auto/tools/qmake/qmake.pro index 02f7e56d11..d535c9c0b8 100644 --- a/tests/auto/tools/qmake/qmake.pro +++ b/tests/auto/tools/qmake/qmake.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmake HEADERS += testcompiler.h SOURCES += tst_qmake.cpp testcompiler.cpp -QT -= gui +QT = core testlib cross_compile: DEFINES += QMAKE_CROSS_COMPILED diff --git a/tests/auto/tools/rcc/rcc.pro b/tests/auto/tools/rcc/rcc.pro index 1b85ff586a..ebe36cfaff 100644 --- a/tests/auto/tools/rcc/rcc.pro +++ b/tests/auto/tools/rcc/rcc.pro @@ -1,6 +1,5 @@ -CONFIG += qttest_p4 - -QT = core +CONFIG += testcase +QT = core testlib TARGET = tst_rcc SOURCES += tst_rcc.cpp diff --git a/tests/auto/tools/uic/uic.pro b/tests/auto/tools/uic/uic.pro index 401c47770a..98463c3944 100644 --- a/tests/auto/tools/uic/uic.pro +++ b/tests/auto/tools/uic/uic.pro @@ -1,6 +1,6 @@ -load(qttest_p4) +CONFIG += testcase -QT = core +QT = core testlib SOURCES += tst_uic.cpp TARGET = tst_uic diff --git a/tests/auto/v8/v8.pro b/tests/auto/v8/v8.pro index f83c6c8053..493ea8e1cb 100644 --- a/tests/auto/v8/v8.pro +++ b/tests/auto/v8/v8.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_v8 macx:CONFIG -= app_bundle SOURCES += tst_v8.cpp v8test.cpp @@ -6,4 +7,4 @@ HEADERS += v8test.h CONFIG += parallel_test -QT = core v8-private +QT = core v8-private testlib diff --git a/tests/auto/xml/dom/qdom/qdom.pro b/tests/auto/xml/dom/qdom/qdom.pro index ff5941b18e..11f5f66152 100644 --- a/tests/auto/xml/dom/qdom/qdom.pro +++ b/tests/auto/xml/dom/qdom/qdom.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qdom SOURCES += tst_qdom.cpp -QT = core xml +QT = core xml testlib QT -= gui wince* { diff --git a/tests/auto/xml/sax/qxml/qxml.pro b/tests/auto/xml/sax/qxml/qxml.pro index 2fce9d9252..4f2e427d14 100644 --- a/tests/auto/xml/sax/qxml/qxml.pro +++ b/tests/auto/xml/sax/qxml/qxml.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qxml SOURCES += tst_qxml.cpp -QT = core xml +QT = core xml testlib wince* { addFiles.files = 0x010D.xml diff --git a/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro b/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro index ec83f4729a..a8bf834074 100644 --- a/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro +++ b/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qxmlinputsource SOURCES += tst_qxmlinputsource.cpp -QT += core xml network +QT += core xml network testlib QT -= gui diff --git a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro index c5ac5e8555..ae924ca35f 100644 --- a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro +++ b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qxmlsimplereader TEMPLATE = app DEPENDPATH += parser INCLUDEPATH += . parser @@ -8,7 +9,7 @@ HEADERS += parser/parser.h SOURCES += tst_qxmlsimplereader.cpp parser/parser.cpp CONFIG += no_batch -QT += network xml +QT += network xml testlib QT -= gui wince* { |