diff options
71 files changed, 69 insertions, 406 deletions
diff --git a/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro b/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro index 170d93ab0c..c13c714543 100644 --- a/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro +++ b/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TARGET = tst_bench_qtextcodec -QT -= gui +QT = core testlib SOURCES += main.cpp wince*:{ diff --git a/tests/benchmarks/corelib/io/qdir/10000/10000.pro b/tests/benchmarks/corelib/io/qdir/10000/10000.pro index a42cc8f96f..0319f2c195 100644 --- a/tests/benchmarks/corelib/io/qdir/10000/10000.pro +++ b/tests/benchmarks/corelib/io/qdir/10000/10000.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = bench_qdir_10000 DEPENDPATH += . @@ -11,4 +6,4 @@ INCLUDEPATH += . # Input SOURCES += bench_qdir_10000.cpp -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/io/qdir/tree/tree.pro b/tests/benchmarks/corelib/io/qdir/tree/tree.pro index 38b84cfa32..415580cc46 100644 --- a/tests/benchmarks/corelib/io/qdir/tree/tree.pro +++ b/tests/benchmarks/corelib/io/qdir/tree/tree.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = bench_qdir_tree DEPENDPATH += . @@ -12,4 +7,4 @@ INCLUDEPATH += . SOURCES += bench_qdir_tree.cpp RESOURCES += bench_qdir_tree.qrc -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro index a7400528e3..af3be799c6 100755 --- a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro +++ b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro @@ -1,14 +1,9 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qdiriterator DEPENDPATH += . INCLUDEPATH += . -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/io/qfile/qfile.pro b/tests/benchmarks/corelib/io/qfile/qfile.pro index aa26732d2e..933469071d 100644 --- a/tests/benchmarks/corelib/io/qfile/qfile.pro +++ b/tests/benchmarks/corelib/io/qfile/qfile.pro @@ -1,11 +1,6 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qfile -QT -= gui +QT = core testlib win32: DEFINES+= _CRT_SECURE_NO_WARNINGS SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro index 2c0075f009..0dca21c1a8 100644 --- a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro +++ b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qfileinfo DEPENDPATH += . @@ -10,7 +5,7 @@ INCLUDEPATH += . QT -= gui -QT += core-private +QT += core-private testlib CONFIG += release diff --git a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro index 54dd0d6861..0dff0ce86e 100755 --- a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro +++ b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro @@ -1,15 +1,10 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qiodevice TARGET.EPOCHEAPSIZE = 0x100000 0x2000000 DEPENDPATH += . INCLUDEPATH += . -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro b/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro index 6f42ae0653..6ebee8a659 100644 --- a/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro +++ b/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro @@ -1,14 +1,9 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qtemporaryfile DEPENDPATH += . INCLUDEPATH += . -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/io/qurl/qurl.pro b/tests/benchmarks/corelib/io/qurl/qurl.pro index 37106e1bf7..52f7bdc8b6 100644 --- a/tests/benchmarks/corelib/io/qurl/qurl.pro +++ b/tests/benchmarks/corelib/io/qurl/qurl.pro @@ -1,11 +1,6 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_qurl -QT -= gui +QT = core testlib win32: DEFINES+= _CRT_SECURE_NO_WARNINGS SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/kernel/events/events.pro b/tests/benchmarks/corelib/kernel/events/events.pro index b82e8652dd..fb50116495 100644 --- a/tests/benchmarks/corelib/kernel/events/events.pro +++ b/tests/benchmarks/corelib/kernel/events/events.pro @@ -1,12 +1,7 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_events DEPENDPATH += . INCLUDEPATH += . # Input SOURCES += main.cpp -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro b/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro index 1c3cc0e51a..47d2acb9b1 100644 --- a/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro +++ b/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app -QT += widgets +QT += widgets testlib TARGET = tst_bench_qmetaobject SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro b/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro index 3dcb7a72a0..5555e5cd14 100644 --- a/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro +++ b/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro @@ -1,9 +1,4 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - -QT = core +QT = core testlib TEMPLATE = app TARGET = tst_qmetatype diff --git a/tests/benchmarks/corelib/kernel/qobject/qobject.pro b/tests/benchmarks/corelib/kernel/qobject/qobject.pro index 991c965f56..8edd038b0d 100644 --- a/tests/benchmarks/corelib/kernel/qobject/qobject.pro +++ b/tests/benchmarks/corelib/kernel/qobject/qobject.pro @@ -1,8 +1,4 @@ -load(qttest_p4) -QT += widgets - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase +QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qobject diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro index 24b9bbdcc2..a5daf0f8ef 100644 --- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro +++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = qtimer_vs_qmetaobject DEPENDPATH += . @@ -13,4 +8,4 @@ CONFIG += release SOURCES += tst_qtimer_vs_qmetaobject.cpp -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro b/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro index 703b5065a4..12d131f262 100644 --- a/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro +++ b/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro @@ -1,12 +1,8 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qvariant DEPENDPATH += . INCLUDEPATH += . +QT += testlib CONFIG += release #CONFIG += debug diff --git a/tests/benchmarks/corelib/plugin/quuid/quuid.pro b/tests/benchmarks/corelib/plugin/quuid/quuid.pro index 8e8f21fb08..8f88bb85b4 100644 --- a/tests/benchmarks/corelib/plugin/quuid/quuid.pro +++ b/tests/benchmarks/corelib/plugin/quuid/quuid.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_quuid SOURCES += tst_quuid.cpp -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/thread/qmutex/qmutex.pro b/tests/benchmarks/corelib/thread/qmutex/qmutex.pro index b4d38f25f0..ec87f60919 100644 --- a/tests/benchmarks/corelib/thread/qmutex/qmutex.pro +++ b/tests/benchmarks/corelib/thread/qmutex/qmutex.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qmutex -QT -= gui +QT = core testlib SOURCES += tst_qmutex.cpp diff --git a/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro b/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro index 199f0ef765..95afc951bc 100644 --- a/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro +++ b/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qthreadstorage SOURCES += tst_qthreadstorage.cpp -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro b/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro index 7c10332357..43c7921a93 100644 --- a/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro +++ b/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro @@ -1,9 +1,4 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qwaitcondition -QT -= gui +QT = core testlib SOURCES += tst_qwaitcondition.cpp diff --git a/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro b/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro index 94c30163b6..940973d8db 100644 --- a/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro +++ b/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_containers-associative DEPENDPATH += . @@ -10,4 +5,4 @@ INCLUDEPATH += . # Input SOURCES += main.cpp -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro b/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro index 7b2298500c..0ae83d70f7 100644 --- a/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro +++ b/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_containers-sequential DEPENDPATH += . @@ -10,4 +5,4 @@ INCLUDEPATH += . # Input SOURCES += main.cpp -QT -= gui +QT = core testlib diff --git a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro b/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro index 76fa3ade41..10fdc7261e 100755 --- a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro +++ b/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro @@ -1,14 +1,9 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qbytearray DEPENDPATH += . INCLUDEPATH += . -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/tools/qchar/qchar.pro b/tests/benchmarks/corelib/tools/qchar/qchar.pro index c4a884f946..80a9861f48 100644 --- a/tests/benchmarks/corelib/tools/qchar/qchar.pro +++ b/tests/benchmarks/corelib/tools/qchar/qchar.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TARGET = tst_bench_qchar -QT -= gui +QT = core testlib SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/tools/qhash/qhash.pro b/tests/benchmarks/corelib/tools/qhash/qhash.pro index 21814f631f..51d3e7f253 100644 --- a/tests/benchmarks/corelib/tools/qhash/qhash.pro +++ b/tests/benchmarks/corelib/tools/qhash/qhash.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TARGET = tst_hash -QT = core +QT = core testlib INCLUDEPATH += . SOURCES += qhash_string.cpp outofline.cpp CONFIG += release diff --git a/tests/benchmarks/corelib/tools/qlist/qlist.pro b/tests/benchmarks/corelib/tools/qlist/qlist.pro index d9ea71767b..bb69d7651d 100644 --- a/tests/benchmarks/corelib/tools/qlist/qlist.pro +++ b/tests/benchmarks/corelib/tools/qlist/qlist.pro @@ -1,9 +1,4 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TARGET = tst_qlist -QT = core +QT = core testlib SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/tools/qrect/qrect.pro b/tests/benchmarks/corelib/tools/qrect/qrect.pro index 71a5c6cefe..b05483599e 100644 --- a/tests/benchmarks/corelib/tools/qrect/qrect.pro +++ b/tests/benchmarks/corelib/tools/qrect/qrect.pro @@ -1,14 +1,9 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qrect DEPENDPATH += . INCLUDEPATH += . -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro index 5fcca00a29..b427150041 100644 --- a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro @@ -1,14 +1,9 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qregexp DEPENDPATH += . INCLUDEPATH += . RESOURCES+=qregexp.qrc -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/tools/qstring/qstring.pro b/tests/benchmarks/corelib/tools/qstring/qstring.pro index 33240aef8d..72300de9da 100644 --- a/tests/benchmarks/corelib/tools/qstring/qstring.pro +++ b/tests/benchmarks/corelib/tools/qstring/qstring.pro @@ -1,11 +1,6 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TARGET = tst_bench_qstring QT -= gui -QT += core-private +QT += core-private testlib SOURCES += main.cpp data.cpp fromlatin1.cpp fromutf8.cpp wince*:{ diff --git a/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro b/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro index 07b96a9b08..fa4cbe3c13 100644 --- a/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro +++ b/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro @@ -1,15 +1,10 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qstringbuilder QMAKE_CXXFLAGS += -g QMAKE_CFLAGS += -g -QT -= gui +QT = core testlib CONFIG += release diff --git a/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro b/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro index c7df0ac160..5803e7da0e 100644 --- a/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro +++ b/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TARGET = tst_bench_qstringlist CONFIG -= debug CONFIG += release -QT -= gui +QT = core testlib SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/tools/qvector/qvector.pro b/tests/benchmarks/corelib/tools/qvector/qvector.pro index c836027453..78a56adcd6 100644 --- a/tests/benchmarks/corelib/tools/qvector/qvector.pro +++ b/tests/benchmarks/corelib/tools/qvector/qvector.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TARGET = tst_vector -QT = core +QT = core testlib INCLUDEPATH += . SOURCES += main.cpp outofline.cpp CONFIG += release diff --git a/tests/benchmarks/dbus/qdbusperformance/test/test.pro b/tests/benchmarks/dbus/qdbusperformance/test/test.pro index 14ecee8339..803479dc25 100644 --- a/tests/benchmarks/dbus/qdbusperformance/test/test.pro +++ b/tests/benchmarks/dbus/qdbusperformance/test/test.pro @@ -1,11 +1,6 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - SOURCES += ../tst_qdbusperformance.cpp HEADERS += ../serverobject.h TARGET = ../tst_qdbusperformance -QT = core +QT = core testlib CONFIG += qdbus diff --git a/tests/benchmarks/dbus/qdbustype/qdbustype.pro b/tests/benchmarks/dbus/qdbustype/qdbustype.pro index 325712edde..03eb54e8ea 100644 --- a/tests/benchmarks/dbus/qdbustype/qdbustype.pro +++ b/tests/benchmarks/dbus/qdbustype/qdbustype.pro @@ -1,11 +1,6 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TARGET = tst_bench_qdbustype QT -= gui -QT += dbus dbus-private +QT += dbus dbus-private testlib QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS LIBS_PRIVATE += $$QT_LIBS_DBUS diff --git a/tests/benchmarks/gui/animation/qanimation/qanimation.pro b/tests/benchmarks/gui/animation/qanimation/qanimation.pro index c18c7b077a..d72e3c87d9 100644 --- a/tests/benchmarks/gui/animation/qanimation/qanimation.pro +++ b/tests/benchmarks/gui/animation/qanimation/qanimation.pro @@ -1,8 +1,4 @@ -load(qttest_p4) -QT += widgets - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase +QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qanimation diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro index b424164325..e25a90609c 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro @@ -1,11 +1,6 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app -QT += svg +QT += svg testlib contains(QT_CONFIG, opengl):QT += opengl HEADERS += widgets/gvbwidget.h \ diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro index f888b45e81..01c0dbd653 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro @@ -1,8 +1,4 @@ -load(qttest_p4) -QT += widgets - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase +QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qgraphicsanchorlayout diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro b/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro index f0049fca91..461ec13263 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro @@ -1,8 +1,4 @@ -load(qttest_p4) -QT += widgets - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase +QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qgraphicsitem diff --git a/tests/benchmarks/gui/graphicsview/qgraphicslayout/qgraphicslayout.pro b/tests/benchmarks/gui/graphicsview/qgraphicslayout/qgraphicslayout.pro index cba9f34f60..9026fb37d8 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicslayout/qgraphicslayout.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicslayout/qgraphicslayout.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qgraphicslayout - +QT += testlib SOURCES += tst_qgraphicslayout.cpp diff --git a/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro b/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro index 2d40944a82..7126c8ecd6 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qgraphicslinearlayout - +QT += testlib SOURCES += tst_qgraphicslinearlayout.cpp diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro b/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro index 223e63126b..769f84423e 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro @@ -1,8 +1,4 @@ -load(qttest_p4) -QT += widgets - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase +QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qgraphicsscene diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro index 21b03f2a09..3d48959f3c 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro @@ -1,8 +1,4 @@ -load(qttest_p4) -QT += widgets - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase +QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qgraphicsview diff --git a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro index 6e191a767e..3c880eeb4d 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro @@ -1,8 +1,4 @@ -load(qttest_p4) -QT += widgets - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase +QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qgraphicswidget diff --git a/tests/benchmarks/gui/image/blendbench/blendbench.pro b/tests/benchmarks/gui/image/blendbench/blendbench.pro index 0f3c9804ae..74ba0a5920 100644 --- a/tests/benchmarks/gui/image/blendbench/blendbench.pro +++ b/tests/benchmarks/gui/image/blendbench/blendbench.pro @@ -1,12 +1,7 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_blendbench DEPENDPATH += . INCLUDEPATH += . - +QT += testlib # Input SOURCES += main.cpp diff --git a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro index 2aefe2422b..7b3ba93737 100644 --- a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro +++ b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro @@ -1,11 +1,6 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_imageConversion - +QT += testlib SOURCES += tst_qimageconversion.cpp !contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF diff --git a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro index 9334ee1374..311ffad009 100644 --- a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro +++ b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro @@ -1,8 +1,4 @@ -load(qttest_p4) -QT += widgets - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase +QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qimagereader diff --git a/tests/benchmarks/gui/image/qpixmap/qpixmap.pro b/tests/benchmarks/gui/image/qpixmap/qpixmap.pro index 6addbb43b7..7ba53857cb 100644 --- a/tests/benchmarks/gui/image/qpixmap/qpixmap.pro +++ b/tests/benchmarks/gui/image/qpixmap/qpixmap.pro @@ -1,9 +1,4 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - -QT += gui-private +QT += gui-private testlib TEMPLATE = app TARGET = tst_bench_qpixmap diff --git a/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro b/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro index 25c6c64f68..7f5d829b26 100644 --- a/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro +++ b/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - -TEMPLATE = app TARGET = tst_bench_qpixmapcache TEMPLATE = app +QT += testlib # Input SOURCES += tst_qpixmapcache.cpp diff --git a/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro b/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro index 800ce8f756..bd2306d646 100644 --- a/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro +++ b/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro @@ -1,8 +1,4 @@ -load(qttest_p4) -QT += widgets - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase +QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qtableview diff --git a/tests/benchmarks/gui/kernel/qapplication/qapplication.pro b/tests/benchmarks/gui/kernel/qapplication/qapplication.pro index 33f90bd228..19ca697102 100644 --- a/tests/benchmarks/gui/kernel/qapplication/qapplication.pro +++ b/tests/benchmarks/gui/kernel/qapplication/qapplication.pro @@ -1,8 +1,4 @@ -load(qttest_p4) -QT += widgets - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase +QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qapplication diff --git a/tests/benchmarks/gui/kernel/qguimetatype/qguimetatype.pro b/tests/benchmarks/gui/kernel/qguimetatype/qguimetatype.pro index 621d587d65..be9cf4b38b 100644 --- a/tests/benchmarks/gui/kernel/qguimetatype/qguimetatype.pro +++ b/tests/benchmarks/gui/kernel/qguimetatype/qguimetatype.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qguimetatype - +QT += testlib SOURCES += tst_qguimetatype.cpp diff --git a/tests/benchmarks/gui/kernel/qguivariant/qguivariant.pro b/tests/benchmarks/gui/kernel/qguivariant/qguivariant.pro index bd42faf73c..63886c21d4 100644 --- a/tests/benchmarks/gui/kernel/qguivariant/qguivariant.pro +++ b/tests/benchmarks/gui/kernel/qguivariant/qguivariant.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qguivariant - +QT += testlib SOURCES += tst_qguivariant.cpp diff --git a/tests/benchmarks/gui/kernel/qwidget/qwidget.pro b/tests/benchmarks/gui/kernel/qwidget/qwidget.pro index ea68f942b5..758c9c5b98 100644 --- a/tests/benchmarks/gui/kernel/qwidget/qwidget.pro +++ b/tests/benchmarks/gui/kernel/qwidget/qwidget.pro @@ -1,8 +1,4 @@ -load(qttest_p4) - -QT += widgets -# do not run benchmarks by default in 'make check' -CONFIG -= testcase +QT += widgets testlib TARGET = tst_bench_qwidget SOURCES += tst_qwidget.cpp diff --git a/tests/benchmarks/gui/math3d/qmatrix4x4/qmatrix4x4.pro b/tests/benchmarks/gui/math3d/qmatrix4x4/qmatrix4x4.pro index 8c26b5f460..fe5c23840f 100644 --- a/tests/benchmarks/gui/math3d/qmatrix4x4/qmatrix4x4.pro +++ b/tests/benchmarks/gui/math3d/qmatrix4x4/qmatrix4x4.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qmatrix4x4 - +QT += testlib SOURCES += tst_qmatrix4x4.cpp diff --git a/tests/benchmarks/gui/math3d/qquaternion/qquaternion.pro b/tests/benchmarks/gui/math3d/qquaternion/qquaternion.pro index 66c1eb656f..e57a3e6a38 100644 --- a/tests/benchmarks/gui/math3d/qquaternion/qquaternion.pro +++ b/tests/benchmarks/gui/math3d/qquaternion/qquaternion.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qquaternion - +QT += testlib SOURCES += tst_qquaternion.cpp diff --git a/tests/benchmarks/gui/painting/qpainter/qpainter.pro b/tests/benchmarks/gui/painting/qpainter/qpainter.pro index 8d3d7c9549..1a1f218033 100644 --- a/tests/benchmarks/gui/painting/qpainter/qpainter.pro +++ b/tests/benchmarks/gui/painting/qpainter/qpainter.pro @@ -1,9 +1,5 @@ -load(qttest_p4) - -QT += widgets +QT += widgets testlib QT += gui-private widgets-private -# do not run benchmarks by default in 'make check' -CONFIG -= testcase TEMPLATE = app TARGET = tst_bench_qpainter diff --git a/tests/benchmarks/gui/painting/qregion/qregion.pro b/tests/benchmarks/gui/painting/qregion/qregion.pro index 94a6a9d843..99bbd39043 100644 --- a/tests/benchmarks/gui/painting/qregion/qregion.pro +++ b/tests/benchmarks/gui/painting/qregion/qregion.pro @@ -1,13 +1,8 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qregion DEPENDPATH += . INCLUDEPATH += . - +QT += testlib CONFIG += release # Input diff --git a/tests/benchmarks/gui/painting/qtbench/qtbench.pro b/tests/benchmarks/gui/painting/qtbench/qtbench.pro index 8c76c587b0..06c77a93c0 100644 --- a/tests/benchmarks/gui/painting/qtbench/qtbench.pro +++ b/tests/benchmarks/gui/painting/qtbench/qtbench.pro @@ -1,8 +1,4 @@ -load(qttest_p4) -QT += widgets - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase +QT += widgets testlib TEMPLATE = app TARGET = tst_qtbench diff --git a/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro b/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro index 64c1c58293..b0a48c4ef0 100644 --- a/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro +++ b/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro @@ -1,9 +1,5 @@ -load(qttest_p4) - -QT += widgets +QT += widgets testlib QT += core-private gui-private widgets-private -# do not run benchmarks by default in 'make check' -CONFIG -= testcase TEMPLATE = app TARGET = tst_qtracebench diff --git a/tests/benchmarks/gui/painting/qtransform/qtransform.pro b/tests/benchmarks/gui/painting/qtransform/qtransform.pro index 8164f53ba2..e8de3fcbd4 100644 --- a/tests/benchmarks/gui/painting/qtransform/qtransform.pro +++ b/tests/benchmarks/gui/painting/qtransform/qtransform.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qtransform - +QT += testlib SOURCES += tst_qtransform.cpp diff --git a/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro b/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro index 8a554e57f9..82558e7ec9 100644 --- a/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro +++ b/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro @@ -1,10 +1,5 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app -QT += widgets +QT += widgets testlib TARGET = tst_bench_qstylesheetstyle DEPENDPATH += . INCLUDEPATH += . diff --git a/tests/benchmarks/gui/text/qfontmetrics/qfontmetrics.pro b/tests/benchmarks/gui/text/qfontmetrics/qfontmetrics.pro index 34dee4e96b..bcaff3de1e 100644 --- a/tests/benchmarks/gui/text/qfontmetrics/qfontmetrics.pro +++ b/tests/benchmarks/gui/text/qfontmetrics/qfontmetrics.pro @@ -1,9 +1,4 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_QFontMetrics - +QT += testlib SOURCES += main.cpp diff --git a/tests/benchmarks/gui/text/qtext/qtext.pro b/tests/benchmarks/gui/text/qtext/qtext.pro index 91368859b6..ef91a97493 100644 --- a/tests/benchmarks/gui/text/qtext/qtext.pro +++ b/tests/benchmarks/gui/text/qtext/qtext.pro @@ -1,9 +1,5 @@ -load(qttest_p4) - -QT += widgets +QT += widgets testlib QT += gui-private widgets-private -# do not run benchmarks by default in 'make check' -CONFIG -= testcase TEMPLATE = app TARGET = tst_bench_QText diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro index 33e6923a6a..bee2adafa1 100644 --- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro +++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro @@ -1,15 +1,10 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qfile_vs_qnetworkaccessmanager DEPENDPATH += . INCLUDEPATH += . QT -= gui -QT += network +QT += network testlib CONFIG += release diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro index 19cf771bcc..fe2204bb16 100644 --- a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro +++ b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro @@ -1,8 +1,3 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qnetworkdiskcache DEPENDPATH += . diff --git a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro index de1487d489..36eeb23fd0 100644 --- a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro +++ b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro @@ -1,15 +1,10 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qnetworkreply DEPENDPATH += . INCLUDEPATH += . QT -= gui -QT += network +QT += network testlib CONFIG += release diff --git a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro index 42396b8cdb..e26406fe74 100755 --- a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro +++ b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro @@ -1,15 +1,10 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qhostinfo DEPENDPATH += . INCLUDEPATH += . QT -= gui -QT += core-private network network-private +QT += core-private network network-private testlib CONFIG += release diff --git a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro index fc27158e17..1ea2f96d78 100644 --- a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro +++ b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro @@ -1,15 +1,10 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qtcpserver DEPENDPATH += . INCLUDEPATH += . QT -= gui -QT += network +QT += network testlib CONFIG += release diff --git a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro index 52a443f7f7..d71fd86316 100644 --- a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro +++ b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro @@ -1,15 +1,10 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_qsslsocket DEPENDPATH += . INCLUDEPATH += . QT -= gui -QT += network +QT += network testlib CONFIG += release diff --git a/tests/benchmarks/opengl/opengl.pro b/tests/benchmarks/opengl/opengl.pro index 1fc9c7d187..2866dbc650 100644 --- a/tests/benchmarks/opengl/opengl.pro +++ b/tests/benchmarks/opengl/opengl.pro @@ -1,14 +1,9 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = tst_bench_opengl DEPENDPATH += . INCLUDEPATH += . -QT += core-private gui-private opengl opengl-private +QT += core-private gui-private opengl opengl-private testlib # Input SOURCES += main.cpp diff --git a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro index f33cbf050e..1db78e332d 100644 --- a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro +++ b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro @@ -1,13 +1,8 @@ -load(qttest_p4) - -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - TEMPLATE = app TARGET = jpeg DEPENDPATH += . INCLUDEPATH += . - +QT += testlib CONFIG += release wince*: { diff --git a/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro b/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro index b8f25e1e47..0f8cb51b59 100644 --- a/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro +++ b/tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro @@ -1,8 +1,5 @@ TARGET = tst_bench_qsqlquery -# do not run benchmarks by default in 'make check' -CONFIG -= testcase - SOURCES += main.cpp QT = core sql testlib |