From c0fb09465b4eaebde953f3c51ad730eab8ee0815 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 25 Oct 2011 11:38:02 +1000 Subject: [PATCH] gui: eliminated usage of qttest_p4.prf qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: I97046aa51f1b3fc100e2eb2fa115f1bf8ae6437d Reviewed-by: Jason McDonald --- tests/auto/gui/image/qicoimageformat/qicoimageformat.pro | 4 +++- tests/auto/gui/image/qicon/qicon.pro | 5 +++-- tests/auto/gui/image/qimage/qimage.pro | 5 +++-- tests/auto/gui/image/qimageiohandler/qimageiohandler.pro | 8 +++----- tests/auto/gui/image/qimagereader/qimagereader.pro | 5 +++-- tests/auto/gui/image/qimagewriter/qimagewriter.pro | 5 +++-- tests/auto/gui/image/qmovie/qmovie.pro | 5 +++-- tests/auto/gui/image/qpicture/qpicture.pro | 5 +++-- tests/auto/gui/image/qpixmap/qpixmap.pro | 5 +++-- tests/auto/gui/image/qpixmapcache/qpixmapcache.pro | 5 +++-- tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro | 5 +++-- tests/auto/gui/image/qvolatileimage/qvolatileimage.pro | 5 +++-- tests/auto/gui/kernel/qclipboard/test/test.pro | 3 ++- tests/auto/gui/kernel/qdrag/qdrag.pro | 5 +++-- tests/auto/gui/kernel/qevent/qevent.pro | 5 +++-- tests/auto/gui/kernel/qfileopenevent/test/test.pro | 4 ++-- tests/auto/gui/kernel/qguimetatype/qguimetatype.pro | 5 +++-- tests/auto/gui/kernel/qguivariant/qguivariant.pro | 6 +++--- tests/auto/gui/kernel/qinputpanel/qinputpanel.pro | 5 +++-- tests/auto/gui/kernel/qkeysequence/qkeysequence.pro | 5 +++-- tests/auto/gui/kernel/qmouseevent/qmouseevent.pro | 5 +++-- tests/auto/gui/kernel/qmouseevent_modal/qmouseevent_modal.pro | 5 +++-- tests/auto/gui/kernel/qpalette/qpalette.pro | 5 +++-- tests/auto/gui/kernel/qshortcut/qshortcut.pro | 5 +++-- tests/auto/gui/math3d/qmatrixnxn/qmatrixnxn.pro | 4 +++- tests/auto/gui/math3d/qquaternion/qquaternion.pro | 4 +++- tests/auto/gui/math3d/qvectornd/qvectornd.pro | 4 +++- tests/auto/gui/painting/qbrush/qbrush.pro | 5 +++-- tests/auto/gui/painting/qcolor/qcolor.pro | 7 +++---- tests/auto/gui/painting/qpaintengine/qpaintengine.pro | 11 +++-------- tests/auto/gui/painting/qpainter/qpainter.pro | 5 +++-- tests/auto/gui/painting/qpainterpath/qpainterpath.pro | 7 +++---- .../gui/painting/qpainterpathstroker/qpainterpathstroker.pro | 7 +++---- tests/auto/gui/painting/qpathclipper/qpathclipper.pro | 5 +++-- tests/auto/gui/painting/qpen/qpen.pro | 7 +++---- tests/auto/gui/painting/qpolygon/qpolygon.pro | 5 +++-- tests/auto/gui/painting/qprinter/qprinter.pro | 5 +++-- tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro | 5 +++-- tests/auto/gui/painting/qregion/qregion.pro | 5 +++-- tests/auto/gui/painting/qtransform/qtransform.pro | 7 +++---- tests/auto/gui/painting/qwmatrix/qwmatrix.pro | 5 +++-- .../qabstracttextdocumentlayout.pro | 5 +++-- tests/auto/gui/text/qcssparser/qcssparser.pro | 5 +++-- tests/auto/gui/text/qfont/qfont.pro | 5 +++-- tests/auto/gui/text/qfontdatabase/qfontdatabase.pro | 4 +++- tests/auto/gui/text/qfontmetrics/qfontmetrics.pro | 4 +++- tests/auto/gui/text/qglyphrun/qglyphrun.pro | 5 +++-- tests/auto/gui/text/qrawfont/qrawfont.pro | 5 +++-- tests/auto/gui/text/qstatictext/qstatictext.pro | 5 +++-- tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro | 6 +++--- tests/auto/gui/text/qtextblock/qtextblock.pro | 5 +++-- tests/auto/gui/text/qtextcursor/qtextcursor.pro | 7 +++---- tests/auto/gui/text/qtextdocument/qtextdocument.pro | 5 +++-- .../gui/text/qtextdocumentfragment/qtextdocumentfragment.pro | 5 +++-- .../auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro | 5 +++-- tests/auto/gui/text/qtextformat/qtextformat.pro | 11 +++-------- tests/auto/gui/text/qtextlayout/qtextlayout.pro | 5 +++-- tests/auto/gui/text/qtextlist/qtextlist.pro | 5 +++-- tests/auto/gui/text/qtextobject/qtextobject.pro | 5 +++-- tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro | 5 +++-- tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro | 5 +++-- tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro | 5 +++-- tests/auto/gui/text/qtexttable/qtexttable.pro | 5 +++-- tests/auto/gui/text/qzip/qzip.pro | 5 +++-- tests/auto/gui/util/qdesktopservices/qdesktopservices.pro | 4 ++-- tests/auto/qopengl/qopengl.pro | 5 +++-- tests/auto/qtransformedscreen/qtransformedscreen.pro | 4 +++- tests/auto/qwindowsurface/qwindowsurface.pro | 5 +++-- tests/auto/qwsembedwidget/qwsembedwidget.pro | 5 +++-- tests/auto/qwsinputmethod/qwsinputmethod.pro | 4 +++- tests/auto/qwswindowsystem/qwswindowsystem.pro | 4 +++- tests/auto/qx11info/qx11info.pro | 5 +++-- 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 aae89db..0ad195f 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 336a63d..34fc5b7 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 87828b9..afa279f 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 46e5cfb..428ff62 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 e706f24..fc2b972 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 ebd5efd..10c950c 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 54cd7a2..d565418 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 eb96b73..82e6244 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 d6d260d..fc09164 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 1ffafd6..fe3b5a2 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 21e10b7..872686b 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 d97eb1e..3d982d7 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 3855227..5d28e8e 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 d9d6455..0173b57 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 6042b6c..09d4395 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 1a813bc..a6d3f32 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 3386cfe..9141424 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 68082f0..9653d8e 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 c61dba4..5e3f4b1 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 6cfbe45..1e0baaf 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 58cebd3..b99c301 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 2f28de2..7fd3a59 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 4b240e5..8975704 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 3f68d23..7ac1dd2 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 cf6e4a1..9c43d60 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 6f740cf..f578a38 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 6346199..9e5155a 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 1c3efd4..2a470c4 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 b9d437e..7dba0ce 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 e37c166..810dd81 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 23cb5db..716d70c 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 9708222..0c0fe89 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 b6f62a2..218183d 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 319dcb3..e8a3b8a 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 53bd5e2..762b8f4 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 1d57028..869fbd3 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 da02bdd..fd01471 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 8c96e2d..6c89d64 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 8dbb484..e9dff9a 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 7cba3db..79ac236 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 8c6a967..a7d79c7 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 22b013e..025b3f8 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 14070a5..d8d275a 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 891cb0a..6d5b3bc 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 4abff18..08442cc 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 c0dc1ab..a636651 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 9d3c625..acdff05 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 3bb3dce..450ef32 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 a8398dc..19ac6ce 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 30fb3a5..14f5add 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 d50ef5c..cad009a 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 828b90c..bae85d9 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 6951758..1f06e29 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 e6ddd45..da8d120 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 32b05ce..505ca8a 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 30f6e50..f810a3b 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 4498ec0..f35239b 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 f66fb96..e9ca3ad 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 e87a364..02ae3ae 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 32913a9..2c8bb39 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 cfbbe2b..930d18f 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 0f5076e..6dcb1b4 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 611b706..88583ff 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 221971c..309f216 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 3014298..98bc5c3 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 b049518..f281c6c 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 6914054..daea2dd 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 f1e8bf6..726be72 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 640b52d..97cbf94 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 d549de0..83ea7f2 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 ee33935..41aa1ae 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 a6c06e6..e9ad008 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 -- 2.7.4