benchmarks: 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: I48ab0ee64d8348cada2e6c7b27c67b6bbc36280d
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
This commit is contained in:
Rohan McGovern 2011-10-25 11:59:25 +10:00 committed by Qt by Nokia
parent 433f5dbbfb
commit 55b6e6fdfb
71 changed files with 69 additions and 406 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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 += .

View File

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

View File

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

View File

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

View File

@ -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 += .

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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