diff options
Diffstat (limited to 'tests/auto/corelib/kernel')
19 files changed, 56 insertions, 41 deletions
diff --git a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro index eee2222cda..b3551dad9f 100644 --- a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro +++ b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qabstractitemmodel mtdir = ../../../integrationtests/modeltest INCLUDEPATH += $$PWD/$${mtdir} -QT += widgets +QT += widgets testlib SOURCES += tst_qabstractitemmodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp HEADERS += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h diff --git a/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro index 031af39df7..33ac65d9ee 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro +++ b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qcoreapplication SOURCES += tst_qcoreapplication.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro index e8f6bbac66..822878e7d2 100644 --- a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro +++ b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qeventloop SOURCES += tst_qeventloop.cpp QT -= gui -QT += network +QT += network testlib win32:!wince*:LIBS += -luser32 diff --git a/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro b/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro index c44fa5a151..f02b14997f 100644 --- a/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro +++ b/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qitemmodel SOURCES += tst_qitemmodel.cpp -QT += widgets sql +QT += widgets sql testlib # NOTE: The deployment of the sqldrivers is disabled on purpose. # If we deploy the plugins, they are loaded twice when running diff --git a/tests/auto/corelib/kernel/qmath/qmath.pro b/tests/auto/corelib/kernel/qmath/qmath.pro index e5784ce7aa..90e61d7132 100644 --- a/tests/auto/corelib/kernel/qmath/qmath.pro +++ b/tests/auto/corelib/kernel/qmath/qmath.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmath -QT = core +QT = core testlib SOURCES += tst_qmath.cpp -QT = core CONFIG += parallel_test diff --git a/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro b/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro index 7a4cf94e47..d5fc3d2ee8 100644 --- a/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro +++ b/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmetaobject -QT = core gui widgets +QT = core gui widgets testlib SOURCES += tst_qmetaobject.cpp diff --git a/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro b/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro index 4369f33b4c..4ceb253125 100644 --- a/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro +++ b/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro @@ -1,4 +1,5 @@ -load(qttest_p4) -QT = core gui +CONFIG += testcase +TARGET = tst_qmetaproperty +QT = core gui testlib SOURCES += tst_qmetaproperty.cpp diff --git a/tests/auto/corelib/kernel/qmetatype/qmetatype.pro b/tests/auto/corelib/kernel/qmetatype/qmetatype.pro index ed1de83927..2841c5f139 100644 --- a/tests/auto/corelib/kernel/qmetatype/qmetatype.pro +++ b/tests/auto/corelib/kernel/qmetatype/qmetatype.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmetatype SOURCES += tst_qmetatype.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/corelib/kernel/qmimedata/qmimedata.pro b/tests/auto/corelib/kernel/qmimedata/qmimedata.pro index 13fbe65edc..e4cf4ce1a6 100644 --- a/tests/auto/corelib/kernel/qmimedata/qmimedata.pro +++ b/tests/auto/corelib/kernel/qmimedata/qmimedata.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmimedata SOURCES += tst_qmimedata.cpp - +QT += testlib diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.pro b/tests/auto/corelib/kernel/qobject/tst_qobject.pro index aac6bdc136..b52e25bb3b 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.pro +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.pro @@ -1,14 +1,15 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qobject SOURCES += tst_qobject.cpp # this is here for a reason, moc_oldnormalizedobject.cpp is not auto-generated, it was generated by # moc from Qt 4.6, and should *not* be generated by the current moc SOURCES += moc_oldnormalizeobject.cpp -QT = core \ +QT = core-private \ network \ gui \ - core-private + testlib wince*: { addFiles.files = signalbug.exe addFiles.path = . diff --git a/tests/auto/corelib/kernel/qpointer/qpointer.pro b/tests/auto/corelib/kernel/qpointer/qpointer.pro index 5728b7bb4f..33a31ebc8c 100644 --- a/tests/auto/corelib/kernel/qpointer/qpointer.pro +++ b/tests/auto/corelib/kernel/qpointer/qpointer.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qpointer +QT += widgets testlib SOURCES += tst_qpointer.cpp diff --git a/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro b/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro index 5af4b70c63..4bca1ab67b 100644 --- a/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro +++ b/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qsignalmapper +QT += widgets testlib SOURCES += tst_qsignalmapper.cpp diff --git a/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro b/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro index d8d1c3f681..a60104c1a4 100644 --- a/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro +++ b/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsocketnotifier SOURCES += tst_qsocketnotifier.cpp -QT = core-private network-private +QT = core-private network-private testlib requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/corelib/kernel/qtimer/qtimer.pro b/tests/auto/corelib/kernel/qtimer/qtimer.pro index 086df1dd18..1b2422826d 100644 --- a/tests/auto/corelib/kernel/qtimer/qtimer.pro +++ b/tests/auto/corelib/kernel/qtimer/qtimer.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qtimer +QT = core testlib SOURCES += tst_qtimer.cpp -QT = core CONFIG += parallel_test diff --git a/tests/auto/corelib/kernel/qtipc/qsharedmemory/test/test.pro b/tests/auto/corelib/kernel/qtipc/qsharedmemory/test/test.pro index c384e15f03..6893c58c70 100644 --- a/tests/auto/corelib/kernel/qtipc/qsharedmemory/test/test.pro +++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/test/test.pro @@ -1,7 +1,7 @@ -load(qttest_p4) +CONFIG += testcase include(../src/src.pri) -QT -= gui +QT = core testlib DEFINES += QSHAREDMEMORY_DEBUG DEFINES += QSYSTEMSEMAPHORE_DEBUG diff --git a/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/qsystemsemaphore.pro b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/qsystemsemaphore.pro index c687e2d162..3c1cf75990 100644 --- a/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/qsystemsemaphore.pro +++ b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/qsystemsemaphore.pro @@ -1,5 +1,5 @@ -load(qttest_p4) -#QT = core +CONFIG += testcase +QT += testlib include(../qsharedmemory/src/src.pri) win32: CONFIG += console diff --git a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro index 4e3f305216..0582499b2d 100644 --- a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro +++ b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qtranslator +QT += widgets testlib SOURCES += tst_qtranslator.cpp RESOURCES += qtranslator.qrc diff --git a/tests/auto/corelib/kernel/qvariant/qvariant.pro b/tests/auto/corelib/kernel/qvariant/qvariant.pro index 0fed3d837f..e81e4d7ce0 100644 --- a/tests/auto/corelib/kernel/qvariant/qvariant.pro +++ b/tests/auto/corelib/kernel/qvariant/qvariant.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qvariant SOURCES += tst_qvariant.cpp -QT += widgets network +QT += widgets network testlib CONFIG+=insignificant_test # See QTBUG-8959 diff --git a/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro b/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro index 4a5ea78ed1..296aab32a8 100644 --- a/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro +++ b/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qwineventnotifier SOURCES += tst_qwineventnotifier.cpp -QT = core core-private +QT = core core-private testlib CONFIG += parallel_test |