diff options
Diffstat (limited to 'tests/auto/integrationtests')
20 files changed, 55 insertions, 38 deletions
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 |