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 <jason.mcdonald@nokia.com>
This commit is contained in:
Rohan McGovern 2011-10-25 11:38:02 +10:00 committed by Qt by Nokia
parent 07102cebde
commit c0fb09465b
72 changed files with 213 additions and 163 deletions

View File

@ -1,5 +1,7 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qicoimageformat
SOURCES+= tst_qicoimageformat.cpp
QT += testlib
wince*: {
DEFINES += SRCDIR=\\\".\\\"

View File

@ -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

View File

@ -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/*

View File

@ -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

View File

@ -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\\\"

View File

@ -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

View File

@ -1,5 +1,6 @@
load(qttest_p4)
QT += widgets
CONFIG += testcase
TARGET = tst_qmovie
QT += widgets testlib
SOURCES += tst_qmovie.cpp
MOC_DIR=tmp

View File

@ -1,5 +1,6 @@
load(qttest_p4)
QT += widgets
CONFIG += testcase
TARGET = tst_qpicture
QT += widgets testlib
SOURCES += tst_qpicture.cpp

View File

@ -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* {

View File

@ -1,5 +1,6 @@
load(qttest_p4)
QT += gui-private
CONFIG += testcase
TARGET = tst_qpixmapcache
QT += gui-private testlib
SOURCES += tst_qpixmapcache.cpp

View File

@ -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

View File

@ -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

View File

@ -1,6 +1,7 @@
load(qttest_p4)
CONFIG += testcase
SOURCES += ../tst_qclipboard.cpp
TARGET = ../tst_qclipboard
QT += testlib
win32 {
CONFIG(debug, debug|release) {

View File

@ -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

View File

@ -1,4 +1,5 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qevent
SOURCES += tst_qevent.cpp
QT = core
QT = core testlib
CONFIG += parallel_test

View File

@ -1,4 +1,4 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qfileopenevent
HEADERS +=
QT += testlib
SOURCES += tst_qfileopenevent.cpp

View File

@ -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

View File

@ -1,5 +1,5 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qguivariant
SOURCES += tst_qguivariant.cpp
QT += testlib

View File

@ -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

View File

@ -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

View File

@ -1,3 +1,4 @@
load(qttest_p4)
QT += widgets
CONFIG += testcase
TARGET = tst_qmouseevent
QT += widgets testlib
SOURCES += tst_qmouseevent.cpp

View File

@ -1,5 +1,6 @@
load(qttest_p4)
QT += widgets
CONFIG += testcase
TARGET = tst_qmouseevent_modal
QT += widgets testlib
SOURCES += tst_qmouseevent_modal.cpp

View File

@ -1,5 +1,6 @@
load(qttest_p4)
QT += widgets
CONFIG += testcase
TARGET = tst_qpalette
QT += widgets testlib
SOURCES += tst_qpalette.cpp

View File

@ -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

View File

@ -1,2 +1,4 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qmatrixnxn
SOURCES += tst_qmatrixnxn.cpp
QT += testlib

View File

@ -1,2 +1,4 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qquaternion
SOURCES += tst_qquaternion.cpp
QT += testlib

View File

@ -1,2 +1,4 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qvectornd
SOURCES += tst_qvectornd.cpp
QT += testlib

View File

@ -1,3 +1,4 @@
load(qttest_p4)
QT += widgets
CONFIG += testcase
TARGET = tst_qbrush
QT += widgets testlib
SOURCES += tst_qbrush.cpp

View File

@ -1,5 +1,4 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qcolor
SOURCES += tst_qcolor.cpp
QT += testlib

View File

@ -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

View File

@ -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* {

View File

@ -1,5 +1,4 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qpainterpath
SOURCES += tst_qpainterpath.cpp
QT += testlib

View File

@ -1,5 +1,4 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qpainterpathstroker
SOURCES += tst_qpainterpathstroker.cpp
QT += testlib

View File

@ -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))

View File

@ -1,5 +1,4 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qpen
SOURCES += tst_qpen.cpp
QT += testlib

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -1,6 +1,7 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qregion
QT += gui-private
QT += gui-private testlib
SOURCES += tst_qregion.cpp

View File

@ -1,7 +1,6 @@
load(qttest_p4)
HEADERS +=
CONFIG += testcase
TARGET = tst_qtransform
SOURCES += tst_qtransform.cpp
QT += testlib
unix:!mac:LIBS+=-lm

View File

@ -1,5 +1,6 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qwmatrix
SOURCES += tst_qwmatrix.cpp
QT += testlib
unix:!mac:LIBS+=-lm

View File

@ -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

View File

@ -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\\\"

View File

@ -1,5 +1,6 @@
load(qttest_p4)
QT += widgets
CONFIG += testcase
TARGET = tst_qfont
QT += widgets testlib
SOURCES += tst_qfont.cpp

View File

@ -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

View File

@ -1,4 +1,6 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qfontmetrics
QT += testlib
SOURCES += tst_qfontmetrics.cpp
RESOURCES += testfont.qrc

View File

@ -1,5 +1,6 @@
load(qttest_p4)
QT = core gui
CONFIG += testcase
TARGET = tst_qglyphrun
QT = core gui testlib
SOURCES += \
tst_qglyphrun.cpp

View File

@ -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

View File

@ -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

View File

@ -1,4 +1,4 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qsyntaxhighlighter
SOURCES += tst_qsyntaxhighlighter.cpp
QT += testlib

View File

@ -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

View File

@ -1,5 +1,4 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qtextcursor
SOURCES += tst_qtextcursor.cpp
QT += testlib

View File

@ -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

View File

@ -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

View File

@ -1,5 +1,6 @@
load(qttest_p4)
QT += widgets
CONFIG += testcase
TARGET = tst_qtextdocumentlayout
QT += widgets testlib
SOURCES += tst_qtextdocumentlayout.cpp

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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\\\"

View File

@ -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

View File

@ -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

View File

@ -1,5 +1,6 @@
load(qttest_p4)
QT += widgets
CONFIG += testcase
TARGET = tst_qtexttable
QT += widgets testlib
SOURCES += tst_qtexttable.cpp

View File

@ -1,5 +1,6 @@
load(qttest_p4)
QT += gui-private
CONFIG += testcase
TARGET = tst_qzip
QT += gui-private testlib
SOURCES += tst_qzip.cpp
wince* {

View File

@ -1,5 +1,5 @@
CONFIG += qttest_p4
QT += widgets
CONFIG += testcase
QT += widgets testlib
SOURCES += tst_qdesktopservices.cpp
TARGET = tst_qdesktopservices

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -1,3 +1,4 @@
load(qttest_p4)
QT += widgets
CONFIG += testcase
TARGET = tst_qwsembedwidget
QT += widgets testlib
SOURCES += tst_qwsembedwidget.cpp

View File

@ -1,2 +1,4 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qwsinputmethod
QT += testlib
SOURCES += tst_qwsinputmethod.cpp

View File

@ -1,2 +1,4 @@
load(qttest_p4)
CONFIG += testcase
TARGET = tst_qwswindowsystem
QT += testlib
SOURCES += tst_qwswindowsystem.cpp

View File

@ -1,5 +1,6 @@
load(qttest_p4)
QT += widgets
CONFIG += testcase
TARGET = tst_qx11info
QT += widgets testlib
SOURCES += tst_qx11info.cpp