diff options
72 files changed, 213 insertions, 163 deletions
diff --git a/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro b/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro index aae89db52f..0ad195f629 100644 --- a/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro +++ b/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro @@ -1,5 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qicoimageformat SOURCES+= tst_qicoimageformat.cpp +QT += testlib wince*: { DEFINES += SRCDIR=\\\".\\\" diff --git a/tests/auto/gui/image/qicon/qicon.pro b/tests/auto/gui/image/qicon/qicon.pro index 336a63d02f..34fc5b7716 100644 --- a/tests/auto/gui/image/qicon/qicon.pro +++ b/tests/auto/gui/image/qicon/qicon.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qicon -QT += widgets +QT += widgets testlib SOURCES += tst_qicon.cpp RESOURCES = tst_qicon.qrc diff --git a/tests/auto/gui/image/qimage/qimage.pro b/tests/auto/gui/image/qimage/qimage.pro index 87828b9c3e..afa279f340 100644 --- a/tests/auto/gui/image/qimage/qimage.pro +++ b/tests/auto/gui/image/qimage/qimage.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qimage SOURCES += tst_qimage.cpp -QT += core-private gui-private +QT += core-private gui-private testlib wince*: { addImages.files = images/* diff --git a/tests/auto/gui/image/qimageiohandler/qimageiohandler.pro b/tests/auto/gui/image/qimageiohandler/qimageiohandler.pro index 46e5cfb2cf..428ff62959 100644 --- a/tests/auto/gui/image/qimageiohandler/qimageiohandler.pro +++ b/tests/auto/gui/image/qimageiohandler/qimageiohandler.pro @@ -1,8 +1,6 @@ -############################################################ -# Project file for autotest for file qimageiohandler.h -############################################################ - -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qimageiohandler +QT += testlib SOURCES += tst_qimageiohandler.cpp diff --git a/tests/auto/gui/image/qimagereader/qimagereader.pro b/tests/auto/gui/image/qimagereader/qimagereader.pro index e706f24814..fc2b97267c 100644 --- a/tests/auto/gui/image/qimagereader/qimagereader.pro +++ b/tests/auto/gui/image/qimagereader/qimagereader.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qimagereader SOURCES += tst_qimagereader.cpp MOC_DIR=tmp -QT += widgets widgets-private core-private gui-private network +QT += widgets widgets-private core-private gui-private network testlib RESOURCES += qimagereader.qrc DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/gui/image/qimagewriter/qimagewriter.pro b/tests/auto/gui/image/qimagewriter/qimagewriter.pro index ebd5efd49a..10c950cf0a 100644 --- a/tests/auto/gui/image/qimagewriter/qimagewriter.pro +++ b/tests/auto/gui/image/qimagewriter/qimagewriter.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qimagewriter +QT += widgets testlib SOURCES += tst_qimagewriter.cpp MOC_DIR=tmp !contains(QT_CONFIG, no-tiff):DEFINES += QTEST_HAVE_TIFF diff --git a/tests/auto/gui/image/qmovie/qmovie.pro b/tests/auto/gui/image/qmovie/qmovie.pro index 54cd7a2548..d565418d6d 100644 --- a/tests/auto/gui/image/qmovie/qmovie.pro +++ b/tests/auto/gui/image/qmovie/qmovie.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qmovie +QT += widgets testlib SOURCES += tst_qmovie.cpp MOC_DIR=tmp diff --git a/tests/auto/gui/image/qpicture/qpicture.pro b/tests/auto/gui/image/qpicture/qpicture.pro index eb96b73487..82e62446a9 100644 --- a/tests/auto/gui/image/qpicture/qpicture.pro +++ b/tests/auto/gui/image/qpicture/qpicture.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qpicture +QT += widgets testlib SOURCES += tst_qpicture.cpp diff --git a/tests/auto/gui/image/qpixmap/qpixmap.pro b/tests/auto/gui/image/qpixmap/qpixmap.pro index d6d260da00..fc09164c46 100644 --- a/tests/auto/gui/image/qpixmap/qpixmap.pro +++ b/tests/auto/gui/image/qpixmap/qpixmap.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qpixmap -QT += core-private gui-private widgets widgets-private +QT += core-private gui-private widgets widgets-private testlib SOURCES += tst_qpixmap.cpp wince* { diff --git a/tests/auto/gui/image/qpixmapcache/qpixmapcache.pro b/tests/auto/gui/image/qpixmapcache/qpixmapcache.pro index 1ffafd6c25..fe3b5a2db3 100644 --- a/tests/auto/gui/image/qpixmapcache/qpixmapcache.pro +++ b/tests/auto/gui/image/qpixmapcache/qpixmapcache.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += gui-private +CONFIG += testcase +TARGET = tst_qpixmapcache +QT += gui-private testlib SOURCES += tst_qpixmapcache.cpp diff --git a/tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro b/tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro index 21e10b7ab9..872686b82f 100644 --- a/tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro +++ b/tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qpixmapfilter -QT += widgets widgets-private +QT += widgets widgets-private testlib QT += gui-private SOURCES += tst_qpixmapfilter.cpp diff --git a/tests/auto/gui/image/qvolatileimage/qvolatileimage.pro b/tests/auto/gui/image/qvolatileimage/qvolatileimage.pro index d97eb1ee13..3d982d7951 100644 --- a/tests/auto/gui/image/qvolatileimage/qvolatileimage.pro +++ b/tests/auto/gui/image/qvolatileimage/qvolatileimage.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qvolatileimage -QT += gui-private widgets +QT += gui-private widgets testlib SOURCES += tst_qvolatileimage.cpp diff --git a/tests/auto/gui/kernel/qclipboard/test/test.pro b/tests/auto/gui/kernel/qclipboard/test/test.pro index 38552273c3..5d28e8e060 100644 --- a/tests/auto/gui/kernel/qclipboard/test/test.pro +++ b/tests/auto/gui/kernel/qclipboard/test/test.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qclipboard.cpp TARGET = ../tst_qclipboard +QT += testlib win32 { CONFIG(debug, debug|release) { diff --git a/tests/auto/gui/kernel/qdrag/qdrag.pro b/tests/auto/gui/kernel/qdrag/qdrag.pro index d9d645559b..0173b57215 100644 --- a/tests/auto/gui/kernel/qdrag/qdrag.pro +++ b/tests/auto/gui/kernel/qdrag/qdrag.pro @@ -2,8 +2,9 @@ # Project file for autotest for file qdrag.h ############################################################ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qdrag +QT += widgets testlib SOURCES += tst_qdrag.cpp diff --git a/tests/auto/gui/kernel/qevent/qevent.pro b/tests/auto/gui/kernel/qevent/qevent.pro index 6042b6cdc9..09d4395f4d 100644 --- a/tests/auto/gui/kernel/qevent/qevent.pro +++ b/tests/auto/gui/kernel/qevent/qevent.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qevent SOURCES += tst_qevent.cpp -QT = core +QT = core testlib CONFIG += parallel_test diff --git a/tests/auto/gui/kernel/qfileopenevent/test/test.pro b/tests/auto/gui/kernel/qfileopenevent/test/test.pro index 1a813bca20..a6d3f322ef 100644 --- a/tests/auto/gui/kernel/qfileopenevent/test/test.pro +++ b/tests/auto/gui/kernel/qfileopenevent/test/test.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase TARGET = tst_qfileopenevent -HEADERS += +QT += testlib SOURCES += tst_qfileopenevent.cpp diff --git a/tests/auto/gui/kernel/qguimetatype/qguimetatype.pro b/tests/auto/gui/kernel/qguimetatype/qguimetatype.pro index 3386cfe2f2..914142404b 100644 --- a/tests/auto/gui/kernel/qguimetatype/qguimetatype.pro +++ b/tests/auto/gui/kernel/qguimetatype/qguimetatype.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qguimetatype SOURCES += tst_qguimetatype.cpp -QT = core gui +QT = core gui testlib CONFIG += parallel_test diff --git a/tests/auto/gui/kernel/qguivariant/qguivariant.pro b/tests/auto/gui/kernel/qguivariant/qguivariant.pro index 68082f0037..9653d8e455 100644 --- a/tests/auto/gui/kernel/qguivariant/qguivariant.pro +++ b/tests/auto/gui/kernel/qguivariant/qguivariant.pro @@ -1,5 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qguivariant SOURCES += tst_qguivariant.cpp - - +QT += testlib diff --git a/tests/auto/gui/kernel/qinputpanel/qinputpanel.pro b/tests/auto/gui/kernel/qinputpanel/qinputpanel.pro index c61dba420c..5e3f4b1504 100644 --- a/tests/auto/gui/kernel/qinputpanel/qinputpanel.pro +++ b/tests/auto/gui/kernel/qinputpanel/qinputpanel.pro @@ -1,3 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qinputpanel SOURCES += tst_qinputpanel.cpp -QT += core-private gui-private +QT += core-private gui-private testlib diff --git a/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro b/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro index 6cfbe459ea..1e0baafd09 100644 --- a/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro +++ b/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qkeysequence -QT += widgets widgets-private +QT += widgets widgets-private testlib QT += core-private gui-private SOURCES += tst_qkeysequence.cpp diff --git a/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro b/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro index 58cebd3d06..b99c3016b0 100644 --- a/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro +++ b/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qmouseevent +QT += widgets testlib SOURCES += tst_qmouseevent.cpp diff --git a/tests/auto/gui/kernel/qmouseevent_modal/qmouseevent_modal.pro b/tests/auto/gui/kernel/qmouseevent_modal/qmouseevent_modal.pro index 2f28de2675..7fd3a59edc 100644 --- a/tests/auto/gui/kernel/qmouseevent_modal/qmouseevent_modal.pro +++ b/tests/auto/gui/kernel/qmouseevent_modal/qmouseevent_modal.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qmouseevent_modal +QT += widgets testlib SOURCES += tst_qmouseevent_modal.cpp diff --git a/tests/auto/gui/kernel/qpalette/qpalette.pro b/tests/auto/gui/kernel/qpalette/qpalette.pro index 4b240e5f9c..8975704f0f 100644 --- a/tests/auto/gui/kernel/qpalette/qpalette.pro +++ b/tests/auto/gui/kernel/qpalette/qpalette.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qpalette +QT += widgets testlib SOURCES += tst_qpalette.cpp diff --git a/tests/auto/gui/kernel/qshortcut/qshortcut.pro b/tests/auto/gui/kernel/qshortcut/qshortcut.pro index 3f68d2377e..7ac1dd2c9d 100644 --- a/tests/auto/gui/kernel/qshortcut/qshortcut.pro +++ b/tests/auto/gui/kernel/qshortcut/qshortcut.pro @@ -1,10 +1,11 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qshortcut # Project Configuration ---------------------------------------------- INCLUDEPATH += ../ # Normal Test Files -------------------------------------------------- -QT += widgets +QT += widgets testlib HEADERS += SOURCES += tst_qshortcut.cpp diff --git a/tests/auto/gui/math3d/qmatrixnxn/qmatrixnxn.pro b/tests/auto/gui/math3d/qmatrixnxn/qmatrixnxn.pro index cf6e4a128e..9c43d6068d 100644 --- a/tests/auto/gui/math3d/qmatrixnxn/qmatrixnxn.pro +++ b/tests/auto/gui/math3d/qmatrixnxn/qmatrixnxn.pro @@ -1,2 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmatrixnxn SOURCES += tst_qmatrixnxn.cpp +QT += testlib diff --git a/tests/auto/gui/math3d/qquaternion/qquaternion.pro b/tests/auto/gui/math3d/qquaternion/qquaternion.pro index 6f740cfd42..f578a38580 100644 --- a/tests/auto/gui/math3d/qquaternion/qquaternion.pro +++ b/tests/auto/gui/math3d/qquaternion/qquaternion.pro @@ -1,2 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qquaternion SOURCES += tst_qquaternion.cpp +QT += testlib diff --git a/tests/auto/gui/math3d/qvectornd/qvectornd.pro b/tests/auto/gui/math3d/qvectornd/qvectornd.pro index 6346199444..9e5155aa6f 100644 --- a/tests/auto/gui/math3d/qvectornd/qvectornd.pro +++ b/tests/auto/gui/math3d/qvectornd/qvectornd.pro @@ -1,2 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qvectornd SOURCES += tst_qvectornd.cpp +QT += testlib diff --git a/tests/auto/gui/painting/qbrush/qbrush.pro b/tests/auto/gui/painting/qbrush/qbrush.pro index 1c3efd46be..2a470c4db1 100644 --- a/tests/auto/gui/painting/qbrush/qbrush.pro +++ b/tests/auto/gui/painting/qbrush/qbrush.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qbrush +QT += widgets testlib SOURCES += tst_qbrush.cpp diff --git a/tests/auto/gui/painting/qcolor/qcolor.pro b/tests/auto/gui/painting/qcolor/qcolor.pro index b9d437ef7c..7dba0cec99 100644 --- a/tests/auto/gui/painting/qcolor/qcolor.pro +++ b/tests/auto/gui/painting/qcolor/qcolor.pro @@ -1,5 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qcolor SOURCES += tst_qcolor.cpp - - - +QT += testlib diff --git a/tests/auto/gui/painting/qpaintengine/qpaintengine.pro b/tests/auto/gui/painting/qpaintengine/qpaintengine.pro index e37c1668ac..810dd81311 100644 --- a/tests/auto/gui/painting/qpaintengine/qpaintengine.pro +++ b/tests/auto/gui/painting/qpaintengine/qpaintengine.pro @@ -1,9 +1,4 @@ -############################################################ -# Project file for autotest for file qpaintengine.h -############################################################ - -load(qttest_p4) - +CONFIG += testcase +TARGET = tst_qpaintengine SOURCES += tst_qpaintengine.cpp - - +QT += testlib diff --git a/tests/auto/gui/painting/qpainter/qpainter.pro b/tests/auto/gui/painting/qpainter/qpainter.pro index 23cb5db16e..716d70c7f5 100644 --- a/tests/auto/gui/painting/qpainter/qpainter.pro +++ b/tests/auto/gui/painting/qpainter/qpainter.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qpainter -QT += widgets widgets-private printsupport +QT += widgets widgets-private printsupport testlib SOURCES += tst_qpainter.cpp wince* { diff --git a/tests/auto/gui/painting/qpainterpath/qpainterpath.pro b/tests/auto/gui/painting/qpainterpath/qpainterpath.pro index 9708222c99..0c0fe8951a 100644 --- a/tests/auto/gui/painting/qpainterpath/qpainterpath.pro +++ b/tests/auto/gui/painting/qpainterpath/qpainterpath.pro @@ -1,5 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qpainterpath SOURCES += tst_qpainterpath.cpp - - - +QT += testlib diff --git a/tests/auto/gui/painting/qpainterpathstroker/qpainterpathstroker.pro b/tests/auto/gui/painting/qpainterpathstroker/qpainterpathstroker.pro index b6f62a2eee..218183da3d 100644 --- a/tests/auto/gui/painting/qpainterpathstroker/qpainterpathstroker.pro +++ b/tests/auto/gui/painting/qpainterpathstroker/qpainterpathstroker.pro @@ -1,5 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qpainterpathstroker SOURCES += tst_qpainterpathstroker.cpp - - - +QT += testlib diff --git a/tests/auto/gui/painting/qpathclipper/qpathclipper.pro b/tests/auto/gui/painting/qpathclipper/qpathclipper.pro index 319dcb3981..e8a3b8a35d 100644 --- a/tests/auto/gui/painting/qpathclipper/qpathclipper.pro +++ b/tests/auto/gui/painting/qpathclipper/qpathclipper.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qpathclipper INCLUDEPATH += . HEADERS += paths.h SOURCES += tst_qpathclipper.cpp paths.cpp -QT += gui-private +QT += gui-private testlib requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/gui/painting/qpen/qpen.pro b/tests/auto/gui/painting/qpen/qpen.pro index 53bd5e2b6e..762b8f47d4 100644 --- a/tests/auto/gui/painting/qpen/qpen.pro +++ b/tests/auto/gui/painting/qpen/qpen.pro @@ -1,5 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qpen SOURCES += tst_qpen.cpp - - - +QT += testlib diff --git a/tests/auto/gui/painting/qpolygon/qpolygon.pro b/tests/auto/gui/painting/qpolygon/qpolygon.pro index 1d5702821c..869fbd30c5 100644 --- a/tests/auto/gui/painting/qpolygon/qpolygon.pro +++ b/tests/auto/gui/painting/qpolygon/qpolygon.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qpolygon +QT += widgets testlib SOURCES += tst_qpolygon.cpp unix:!mac:LIBS+=-lm diff --git a/tests/auto/gui/painting/qprinter/qprinter.pro b/tests/auto/gui/painting/qprinter/qprinter.pro index da02bdd7d6..fd01471d5b 100644 --- a/tests/auto/gui/painting/qprinter/qprinter.pro +++ b/tests/auto/gui/painting/qprinter/qprinter.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += printsupport widgets +CONFIG += testcase +TARGET = tst_qprinter +QT += printsupport widgets testlib SOURCES += tst_qprinter.cpp mac*:CONFIG+=insignificant_test diff --git a/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro b/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro index 8c96e2dcb7..6c89d645ae 100644 --- a/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro +++ b/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qprinterinfo SOURCES += tst_qprinterinfo.cpp -QT += printsupport network +QT += printsupport network testlib DEFINES += QT_USE_USING_NAMESPACE diff --git a/tests/auto/gui/painting/qregion/qregion.pro b/tests/auto/gui/painting/qregion/qregion.pro index 8dbb4844a0..e9dff9a32e 100644 --- a/tests/auto/gui/painting/qregion/qregion.pro +++ b/tests/auto/gui/painting/qregion/qregion.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qregion -QT += gui-private +QT += gui-private testlib SOURCES += tst_qregion.cpp diff --git a/tests/auto/gui/painting/qtransform/qtransform.pro b/tests/auto/gui/painting/qtransform/qtransform.pro index 7cba3dbb52..79ac236b4d 100644 --- a/tests/auto/gui/painting/qtransform/qtransform.pro +++ b/tests/auto/gui/painting/qtransform/qtransform.pro @@ -1,7 +1,6 @@ -load(qttest_p4) -HEADERS += +CONFIG += testcase +TARGET = tst_qtransform SOURCES += tst_qtransform.cpp +QT += testlib unix:!mac:LIBS+=-lm - - diff --git a/tests/auto/gui/painting/qwmatrix/qwmatrix.pro b/tests/auto/gui/painting/qwmatrix/qwmatrix.pro index 8c6a96794c..a7d79c7d2a 100644 --- a/tests/auto/gui/painting/qwmatrix/qwmatrix.pro +++ b/tests/auto/gui/painting/qwmatrix/qwmatrix.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qwmatrix SOURCES += tst_qwmatrix.cpp +QT += testlib unix:!mac:LIBS+=-lm - diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro b/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro index 22b013e37e..025b3f8a26 100644 --- a/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro +++ b/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro @@ -2,8 +2,9 @@ # Project file for autotest for file qabstracttextdocumentlayout.h ############################################################ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qabstracttextdocumentlayout +QT += widgets testlib SOURCES += tst_qabstracttextdocumentlayout.cpp diff --git a/tests/auto/gui/text/qcssparser/qcssparser.pro b/tests/auto/gui/text/qcssparser/qcssparser.pro index 14070a5215..d8d275a377 100644 --- a/tests/auto/gui/text/qcssparser/qcssparser.pro +++ b/tests/auto/gui/text/qcssparser/qcssparser.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qcssparser SOURCES += tst_qcssparser.cpp -QT += xml gui-private +QT += xml gui-private testlib requires(contains(QT_CONFIG,private_tests)) DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/gui/text/qfont/qfont.pro b/tests/auto/gui/text/qfont/qfont.pro index 891cb0a093..6d5b3bc9de 100644 --- a/tests/auto/gui/text/qfont/qfont.pro +++ b/tests/auto/gui/text/qfont/qfont.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qfont +QT += widgets testlib SOURCES += tst_qfont.cpp diff --git a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro index 4abff18412..08442cc0ad 100644 --- a/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro +++ b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro @@ -1,6 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qfontdatabase SOURCES += tst_qfontdatabase.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" +QT += testlib wince* { additionalFiles.files = FreeMono.ttf diff --git a/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro b/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro index c0dc1abbe6..a636651724 100644 --- a/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro +++ b/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro @@ -1,4 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qfontmetrics +QT += testlib SOURCES += tst_qfontmetrics.cpp RESOURCES += testfont.qrc diff --git a/tests/auto/gui/text/qglyphrun/qglyphrun.pro b/tests/auto/gui/text/qglyphrun/qglyphrun.pro index 9d3c6253e0..acdff0584f 100644 --- a/tests/auto/gui/text/qglyphrun/qglyphrun.pro +++ b/tests/auto/gui/text/qglyphrun/qglyphrun.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core gui +CONFIG += testcase +TARGET = tst_qglyphrun +QT = core gui testlib SOURCES += \ tst_qglyphrun.cpp diff --git a/tests/auto/gui/text/qrawfont/qrawfont.pro b/tests/auto/gui/text/qrawfont/qrawfont.pro index 3bb3dcee40..450ef327b5 100644 --- a/tests/auto/gui/text/qrawfont/qrawfont.pro +++ b/tests/auto/gui/text/qrawfont/qrawfont.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qrawfont -QT = core core-private gui gui-private +QT = core core-private gui gui-private testlib SOURCES += \ tst_qrawfont.cpp diff --git a/tests/auto/gui/text/qstatictext/qstatictext.pro b/tests/auto/gui/text/qstatictext/qstatictext.pro index a8398dccf9..19ac6cec13 100644 --- a/tests/auto/gui/text/qstatictext/qstatictext.pro +++ b/tests/auto/gui/text/qstatictext/qstatictext.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets widgets-private +CONFIG += testcase +TARGET = tst_qstatictext +QT += widgets widgets-private testlib QT += core core-private gui gui-private SOURCES += tst_qstatictext.cpp diff --git a/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro b/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro index 30fb3a5283..14f5add8cc 100644 --- a/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro +++ b/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qsyntaxhighlighter SOURCES += tst_qsyntaxhighlighter.cpp - - +QT += testlib diff --git a/tests/auto/gui/text/qtextblock/qtextblock.pro b/tests/auto/gui/text/qtextblock/qtextblock.pro index d50ef5ca78..cad009a35a 100644 --- a/tests/auto/gui/text/qtextblock/qtextblock.pro +++ b/tests/auto/gui/text/qtextblock/qtextblock.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtextblock -QT += widgets widgets-private +QT += widgets widgets-private testlib QT += core-private gui-private SOURCES += tst_qtextblock.cpp diff --git a/tests/auto/gui/text/qtextcursor/qtextcursor.pro b/tests/auto/gui/text/qtextcursor/qtextcursor.pro index 828b90ca16..bae85d9c37 100644 --- a/tests/auto/gui/text/qtextcursor/qtextcursor.pro +++ b/tests/auto/gui/text/qtextcursor/qtextcursor.pro @@ -1,5 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtextcursor SOURCES += tst_qtextcursor.cpp - - - +QT += testlib diff --git a/tests/auto/gui/text/qtextdocument/qtextdocument.pro b/tests/auto/gui/text/qtextdocument/qtextdocument.pro index 69517589cc..1f06e297f2 100644 --- a/tests/auto/gui/text/qtextdocument/qtextdocument.pro +++ b/tests/auto/gui/text/qtextdocument/qtextdocument.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += core-private gui-private xml +CONFIG += testcase +TARGET = tst_qtextdocument +QT += core-private gui-private xml testlib HEADERS += common.h SOURCES += tst_qtextdocument.cpp diff --git a/tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro b/tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro index e6ddd45f85..da8d120c69 100644 --- a/tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro +++ b/tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtextdocumentfragment -QT += core-private gui-private +QT += core-private gui-private testlib SOURCES += tst_qtextdocumentfragment.cpp diff --git a/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro b/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro index 32b05ce061..505ca8a2bd 100644 --- a/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro +++ b/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qtextdocumentlayout +QT += widgets testlib SOURCES += tst_qtextdocumentlayout.cpp diff --git a/tests/auto/gui/text/qtextformat/qtextformat.pro b/tests/auto/gui/text/qtextformat/qtextformat.pro index 30f6e50c61..f810a3bb64 100644 --- a/tests/auto/gui/text/qtextformat/qtextformat.pro +++ b/tests/auto/gui/text/qtextformat/qtextformat.pro @@ -1,9 +1,4 @@ -############################################################ -# Project file for autotest for file qtextformat.h -############################################################ - -load(qttest_p4) - +CONFIG += testcase +TARGET = tst_qtextformat +QT += testlib SOURCES += tst_qtextformat.cpp - - diff --git a/tests/auto/gui/text/qtextlayout/qtextlayout.pro b/tests/auto/gui/text/qtextlayout/qtextlayout.pro index 4498ec02a1..f35239bc6a 100644 --- a/tests/auto/gui/text/qtextlayout/qtextlayout.pro +++ b/tests/auto/gui/text/qtextlayout/qtextlayout.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += core-private gui-private +CONFIG += testcase +TARGET = tst_qtextlayout +QT += core-private gui-private testlib HEADERS += SOURCES += tst_qtextlayout.cpp DEFINES += QT_COMPILES_IN_HARFBUZZ diff --git a/tests/auto/gui/text/qtextlist/qtextlist.pro b/tests/auto/gui/text/qtextlist/qtextlist.pro index f66fb96dd0..e9ca3ad0a0 100644 --- a/tests/auto/gui/text/qtextlist/qtextlist.pro +++ b/tests/auto/gui/text/qtextlist/qtextlist.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtextlist -QT += core-private gui-private +QT += core-private gui-private testlib SOURCES += tst_qtextlist.cpp HEADERS += ../qtextdocument/common.h diff --git a/tests/auto/gui/text/qtextobject/qtextobject.pro b/tests/auto/gui/text/qtextobject/qtextobject.pro index e87a364ab6..02ae3ae758 100644 --- a/tests/auto/gui/text/qtextobject/qtextobject.pro +++ b/tests/auto/gui/text/qtextobject/qtextobject.pro @@ -2,8 +2,9 @@ # Project file for autotest for file qtextobject.h ############################################################ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qtextobject +QT += widgets testlib SOURCES += tst_qtextobject.cpp diff --git a/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro b/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro index 32913a9c17..2c8bb39f6d 100644 --- a/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro +++ b/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += core-private gui-private +CONFIG += testcase +TARGET = tst_qtextodfwriter +QT += core-private gui-private testlib SOURCES += tst_qtextodfwriter.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro b/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro index cfbbe2bca5..930d18f5fe 100644 --- a/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro +++ b/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets widgets-private +CONFIG += testcase +TARGET = tst_qtextpiecetable +QT += widgets widgets-private testlib QT += core-private gui-private SOURCES += tst_qtextpiecetable.cpp HEADERS += ../qtextdocument/common.h diff --git a/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro b/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro index 0f5076e2ed..6dcb1b44a0 100644 --- a/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro +++ b/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtextscriptengine -QT += core-private gui-private +QT += core-private gui-private testlib HEADERS += SOURCES += tst_qtextscriptengine.cpp diff --git a/tests/auto/gui/text/qtexttable/qtexttable.pro b/tests/auto/gui/text/qtexttable/qtexttable.pro index 611b706fc4..88583ff904 100644 --- a/tests/auto/gui/text/qtexttable/qtexttable.pro +++ b/tests/auto/gui/text/qtexttable/qtexttable.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qtexttable +QT += widgets testlib SOURCES += tst_qtexttable.cpp diff --git a/tests/auto/gui/text/qzip/qzip.pro b/tests/auto/gui/text/qzip/qzip.pro index 221971c560..309f2167d1 100644 --- a/tests/auto/gui/text/qzip/qzip.pro +++ b/tests/auto/gui/text/qzip/qzip.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += gui-private +CONFIG += testcase +TARGET = tst_qzip +QT += gui-private testlib SOURCES += tst_qzip.cpp wince* { diff --git a/tests/auto/gui/util/qdesktopservices/qdesktopservices.pro b/tests/auto/gui/util/qdesktopservices/qdesktopservices.pro index 3014298239..98bc5c3d0d 100644 --- a/tests/auto/gui/util/qdesktopservices/qdesktopservices.pro +++ b/tests/auto/gui/util/qdesktopservices/qdesktopservices.pro @@ -1,5 +1,5 @@ -CONFIG += qttest_p4 -QT += widgets +CONFIG += testcase +QT += widgets testlib SOURCES += tst_qdesktopservices.cpp TARGET = tst_qdesktopservices diff --git a/tests/auto/qopengl/qopengl.pro b/tests/auto/qopengl/qopengl.pro index b049518f7a..f281c6c439 100644 --- a/tests/auto/qopengl/qopengl.pro +++ b/tests/auto/qopengl/qopengl.pro @@ -2,8 +2,9 @@ # Project file for autotest for gui/opengl functionality ############################################################ -load(qttest_p4) -QT += gui gui-private core-private +CONFIG += testcase +TARGET = tst_qopengl +QT += gui gui-private core-private testlib SOURCES += tst_qopengl.cpp diff --git a/tests/auto/qtransformedscreen/qtransformedscreen.pro b/tests/auto/qtransformedscreen/qtransformedscreen.pro index 6914054de3..daea2dd09f 100644 --- a/tests/auto/qtransformedscreen/qtransformedscreen.pro +++ b/tests/auto/qtransformedscreen/qtransformedscreen.pro @@ -1,5 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtransformedscreen SOURCES += tst_qtransformedscreen.cpp +QT += testlib embedded:!contains(gfx-drivers, transformed) { LIBS += ../../../plugins/gfxdrivers/libqgfxtransformed.so diff --git a/tests/auto/qwindowsurface/qwindowsurface.pro b/tests/auto/qwindowsurface/qwindowsurface.pro index f1e8bf6070..726be7202b 100644 --- a/tests/auto/qwindowsurface/qwindowsurface.pro +++ b/tests/auto/qwindowsurface/qwindowsurface.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qwindowsurface -QT += widgets widgets-private +QT += widgets widgets-private testlib QT += gui-private SOURCES += tst_qwindowsurface.cpp diff --git a/tests/auto/qwsembedwidget/qwsembedwidget.pro b/tests/auto/qwsembedwidget/qwsembedwidget.pro index 640b52d384..97cbf94bf2 100644 --- a/tests/auto/qwsembedwidget/qwsembedwidget.pro +++ b/tests/auto/qwsembedwidget/qwsembedwidget.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qwsembedwidget +QT += widgets testlib SOURCES += tst_qwsembedwidget.cpp diff --git a/tests/auto/qwsinputmethod/qwsinputmethod.pro b/tests/auto/qwsinputmethod/qwsinputmethod.pro index d549de0126..83ea7f22f3 100644 --- a/tests/auto/qwsinputmethod/qwsinputmethod.pro +++ b/tests/auto/qwsinputmethod/qwsinputmethod.pro @@ -1,2 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qwsinputmethod +QT += testlib SOURCES += tst_qwsinputmethod.cpp diff --git a/tests/auto/qwswindowsystem/qwswindowsystem.pro b/tests/auto/qwswindowsystem/qwswindowsystem.pro index ee33935ea5..41aa1aea9d 100644 --- a/tests/auto/qwswindowsystem/qwswindowsystem.pro +++ b/tests/auto/qwswindowsystem/qwswindowsystem.pro @@ -1,2 +1,4 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qwswindowsystem +QT += testlib SOURCES += tst_qwswindowsystem.cpp diff --git a/tests/auto/qx11info/qx11info.pro b/tests/auto/qx11info/qx11info.pro index a6c06e6fff..e9ad008eb5 100644 --- a/tests/auto/qx11info/qx11info.pro +++ b/tests/auto/qx11info/qx11info.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT += widgets +CONFIG += testcase +TARGET = tst_qx11info +QT += widgets testlib SOURCES += tst_qx11info.cpp |