diff options
Diffstat (limited to 'tests/auto/corelib/kernel')
18 files changed, 37 insertions, 65 deletions
diff --git a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro index b3551dad9f..ba4435f4c8 100644 --- a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro +++ b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro @@ -1,8 +1,8 @@ CONFIG += testcase TARGET = tst_qabstractitemmodel +QT = widgets testlib mtdir = ../../../integrationtests/modeltest INCLUDEPATH += $$PWD/$${mtdir} -QT += widgets testlib -SOURCES += tst_qabstractitemmodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp -HEADERS += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h +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 33ac65d9ee..f9a38c2f14 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro +++ b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qcoreapplication -SOURCES += tst_qcoreapplication.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qcoreapplication.cpp diff --git a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro index 822878e7d2..0fee018bf1 100644 --- a/tests/auto/corelib/kernel/qeventloop/qeventloop.pro +++ b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro @@ -1,7 +1,6 @@ CONFIG += testcase TARGET = tst_qeventloop -SOURCES += tst_qeventloop.cpp -QT -= gui -QT += network testlib +QT = network testlib +SOURCES = tst_qeventloop.cpp win32:!wince*:LIBS += -luser32 diff --git a/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro b/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro index f02b14997f..89e0129f17 100644 --- a/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro +++ b/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qitemmodel -SOURCES += tst_qitemmodel.cpp - -QT += widgets sql testlib +QT = widgets sql testlib +SOURCES = tst_qitemmodel.cpp # 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 90e61d7132..7d13d724fe 100644 --- a/tests/auto/corelib/kernel/qmath/qmath.pro +++ b/tests/auto/corelib/kernel/qmath/qmath.pro @@ -1,7 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qmath - QT = core testlib - -SOURCES += tst_qmath.cpp -CONFIG += parallel_test +SOURCES = tst_qmath.cpp diff --git a/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro b/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro index d5fc3d2ee8..e7c20d8408 100644 --- a/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro +++ b/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro @@ -1,9 +1,4 @@ CONFIG += testcase TARGET = tst_qmetaobject - QT = core gui widgets testlib - -SOURCES += tst_qmetaobject.cpp - - - +SOURCES = tst_qmetaobject.cpp diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro b/tests/auto/corelib/kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro index eb9810dd53..5380f90e75 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro @@ -1,9 +1,5 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qmetaobjectbuilder +QT = core-private gui-private testlib +SOURCES = tst_qmetaobjectbuilder.cpp macx:CONFIG -= app_bundle - -SOURCES += \ - tst_qmetaobjectbuilder.cpp - -CONFIG += parallel_test -QT += core-private gui-private testlib diff --git a/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro b/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro index 4ceb253125..e097b38919 100644 --- a/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro +++ b/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro @@ -1,5 +1,4 @@ CONFIG += testcase TARGET = tst_qmetaproperty QT = core gui testlib -SOURCES += tst_qmetaproperty.cpp - +SOURCES = tst_qmetaproperty.cpp diff --git a/tests/auto/corelib/kernel/qmetatype/qmetatype.pro b/tests/auto/corelib/kernel/qmetatype/qmetatype.pro index 2841c5f139..aa7d59b567 100644 --- a/tests/auto/corelib/kernel/qmetatype/qmetatype.pro +++ b/tests/auto/corelib/kernel/qmetatype/qmetatype.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qmetatype -SOURCES += tst_qmetatype.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qmetatype.cpp diff --git a/tests/auto/corelib/kernel/qmimedata/qmimedata.pro b/tests/auto/corelib/kernel/qmimedata/qmimedata.pro index e4cf4ce1a6..30b4e668ac 100644 --- a/tests/auto/corelib/kernel/qmimedata/qmimedata.pro +++ b/tests/auto/corelib/kernel/qmimedata/qmimedata.pro @@ -1,5 +1,4 @@ CONFIG += testcase TARGET = tst_qmimedata -SOURCES += tst_qmimedata.cpp -QT += testlib - +QT = gui testlib +SOURCES = tst_qmimedata.cpp diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.pro b/tests/auto/corelib/kernel/qobject/tst_qobject.pro index b52e25bb3b..bbc02ce34d 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.pro +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.pro @@ -1,16 +1,13 @@ CONFIG += testcase TARGET = tst_qobject -SOURCES += tst_qobject.cpp +QT = core-private network gui testlib +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-private \ - network \ - gui \ - testlib -wince*: { +wince* { addFiles.files = signalbug.exe addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/corelib/kernel/qpointer/qpointer.pro b/tests/auto/corelib/kernel/qpointer/qpointer.pro index 33a31ebc8c..db1a75c3b6 100644 --- a/tests/auto/corelib/kernel/qpointer/qpointer.pro +++ b/tests/auto/corelib/kernel/qpointer/qpointer.pro @@ -1,6 +1,4 @@ CONFIG += testcase TARGET = tst_qpointer -QT += widgets testlib -SOURCES += tst_qpointer.cpp - - +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 4bca1ab67b..5ec67cd21f 100644 --- a/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro +++ b/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro @@ -1,7 +1,4 @@ CONFIG += testcase TARGET = tst_qsignalmapper -QT += widgets testlib -SOURCES += tst_qsignalmapper.cpp - - - +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 0ec91793e4..58e4b98af7 100644 --- a/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro +++ b/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qsocketnotifier -SOURCES += tst_qsocketnotifier.cpp QT = core-private network-private testlib +SOURCES = tst_qsocketnotifier.cpp 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 1b2422826d..a52141f927 100644 --- a/tests/auto/corelib/kernel/qtimer/qtimer.pro +++ b/tests/auto/corelib/kernel/qtimer/qtimer.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtimer QT = core testlib -SOURCES += tst_qtimer.cpp -CONFIG += parallel_test +SOURCES = tst_qtimer.cpp diff --git a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro index 0582499b2d..603b128601 100644 --- a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro +++ b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qtranslator -QT += widgets testlib -SOURCES += tst_qtranslator.cpp +QT = widgets testlib +SOURCES = tst_qtranslator.cpp RESOURCES += qtranslator.qrc wince* { diff --git a/tests/auto/corelib/kernel/qvariant/qvariant.pro b/tests/auto/corelib/kernel/qvariant/qvariant.pro index 7d9cfc288f..00932f9576 100644 --- a/tests/auto/corelib/kernel/qvariant/qvariant.pro +++ b/tests/auto/corelib/kernel/qvariant/qvariant.pro @@ -1,4 +1,4 @@ CONFIG += testcase TARGET = tst_qvariant -SOURCES += tst_qvariant.cpp -QT += widgets network testlib +QT = widgets network testlib +SOURCES = tst_qvariant.cpp diff --git a/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro b/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro index 296aab32a8..b0f194c1dd 100644 --- a/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro +++ b/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qwineventnotifier -SOURCES += tst_qwineventnotifier.cpp -QT = core core-private testlib -CONFIG += parallel_test +QT = core-private testlib +SOURCES = tst_qwineventnotifier.cpp |