Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: tests: fix private header inclusion in qtbase autotests tests: disable tests in qtbase which depend on qtsvg tests: make benchmarks compile or disable those which don't compile tests: remove references to benchmark directories which don't exist tests: enable compilation of autotests for qtbase by default tests: make tst_qrawfont compile for QGlyphs -> QGlyphRun API change tests: mark some tests as using private API
This commit is contained in:
commit
6954a35bb5
2
configure
vendored
2
configure
vendored
@ -699,7 +699,7 @@ CFG_FONTCONFIG=auto
|
||||
CFG_QWS_FREETYPE=auto
|
||||
CFG_LIBFREETYPE=auto
|
||||
CFG_SQL_AVAILABLE=
|
||||
QT_DEFAULT_BUILD_PARTS="libs examples demos"
|
||||
QT_DEFAULT_BUILD_PARTS="libs examples demos tests"
|
||||
CFG_BUILD_PARTS=""
|
||||
CFG_NOBUILD_PARTS=""
|
||||
CFG_RELEASE_QMAKE=no
|
||||
|
11
qtbase.pro
11
qtbase.pro
@ -7,12 +7,19 @@ TEMPLATE = subdirs
|
||||
|
||||
cross_compile: CONFIG += nostrip
|
||||
|
||||
module_qtbase_tests.subdir = tests
|
||||
module_qtbase_tests.target = module-qtbase-tests
|
||||
module_qtbase_tests.depends = module_qtbase_src
|
||||
module_qtbase_tests.CONFIG = no_default_target no_default_install
|
||||
|
||||
#process the projects
|
||||
for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
|
||||
isEqual(PROJECT, examples) {
|
||||
SUBDIRS += examples
|
||||
} else:isEqual(PROJECT, demos) {
|
||||
SUBDIRS += demos
|
||||
} else:isEqual(PROJECT, tests) {
|
||||
module_qtbase_tests.CONFIG -= no_default_target
|
||||
} else:isEqual(PROJECT, libs) {
|
||||
include(src/src.pro)
|
||||
} else:isEqual(PROJECT, qmake) {
|
||||
@ -22,10 +29,6 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
|
||||
}
|
||||
}
|
||||
|
||||
module_qtbase_tests.subdir = tests
|
||||
module_qtbase_tests.target = module-qtbase-tests
|
||||
module_qtbase_tests.depends = module_qtbase_src
|
||||
module_qtbase_tests.CONFIG = no_default_target no_default_install
|
||||
SUBDIRS += module_qtbase_tests
|
||||
|
||||
!symbian: confclean.depends += clean
|
||||
|
@ -112,3 +112,6 @@ symbian:SUBDIRS -= \
|
||||
qtconcurrentrun \
|
||||
qtconcurrentthreadengine \
|
||||
|
||||
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
|
||||
qfileinfo \
|
||||
|
||||
|
@ -209,11 +209,23 @@ SUBDIRS=\
|
||||
win32:SUBDIRS -= qtextpiecetable
|
||||
|
||||
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
|
||||
qcolumnview \
|
||||
qgraphicsanchorlayout \
|
||||
qgraphicsanchorlayout1 \
|
||||
qgraphicsitem \
|
||||
qgraphicsscene \
|
||||
qgraphicssceneindex \
|
||||
qlistwidget \
|
||||
qmainwindow \
|
||||
qnetworkreply \
|
||||
qpathclipper \
|
||||
qpixmapcache \
|
||||
qsidebar \
|
||||
qstylesheetstyle \
|
||||
qtextlayout \
|
||||
qtextpiecetable \
|
||||
qtipc \
|
||||
qtoolbar \
|
||||
|
||||
symbian:SUBDIRS -= \
|
||||
qsystemtrayicon \
|
||||
|
@ -3,7 +3,7 @@ SUBDIRS=\
|
||||
compiler \
|
||||
headersclean \
|
||||
maketestselftest \
|
||||
moc \
|
||||
#moc \ # FIXME: cannot be built as part of qtbase, since it depends on qtsvg
|
||||
uic \
|
||||
qmake \
|
||||
rcc \
|
||||
|
@ -1,3 +1,4 @@
|
||||
load(qttest_p4)
|
||||
QT += core-private
|
||||
SOURCES += tst_languagechange.cpp
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += gui-private
|
||||
|
||||
SOURCES += tst_nativeimagehandleprovider.cpp
|
||||
symbian {
|
||||
LIBS += -lfbscli -lbitgdi
|
||||
|
@ -45,10 +45,12 @@ SUBDIRS=\
|
||||
# qnetworkproxyfactory \ # Uses a hardcoded proxy configuration
|
||||
|
||||
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
|
||||
platformsocketengine \
|
||||
qauthenticator \
|
||||
qhostinfo \
|
||||
qhttpnetworkconnection \
|
||||
qhttpnetworkreply \
|
||||
platformsocketengine \
|
||||
qhttpsocketengine \
|
||||
qsocketnotifier \
|
||||
qsocks5socketengine \
|
||||
|
||||
|
@ -10,7 +10,8 @@ SUBDIRS=\
|
||||
qalgorithms \
|
||||
qcombobox \
|
||||
qcssparser \
|
||||
qdatastream \
|
||||
#qdatastream \ # FIXME: cannot be enabled by default in qtbase,
|
||||
# since it depends on qtsvg
|
||||
qdir \
|
||||
qfocusevent \
|
||||
qimage \
|
||||
@ -58,5 +59,7 @@ symbian {
|
||||
|
||||
# Following tests depends on private API
|
||||
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
|
||||
qcombobox \
|
||||
qcssparser \
|
||||
qtextedit \
|
||||
|
||||
|
@ -1,5 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += ../tst_qapplication.cpp
|
||||
TARGET = ../tst_qapplication
|
||||
|
||||
|
@ -2,7 +2,7 @@ load(qttest_p4)
|
||||
SOURCES += tst_qbytearray.cpp
|
||||
|
||||
|
||||
QT = core
|
||||
QT = core core-private
|
||||
|
||||
wince*|symbian {
|
||||
addFile.files = rfc3252.txt
|
||||
|
@ -1,7 +1,7 @@
|
||||
load(qttest_p4)
|
||||
SOURCES += tst_qchar.cpp
|
||||
|
||||
QT = core
|
||||
QT = core core-private
|
||||
|
||||
wince*|symbian: {
|
||||
deploy.files += NormalizationTest.txt
|
||||
|
@ -1,4 +1,5 @@
|
||||
load(qttest_p4)
|
||||
QT += core-private gui-private
|
||||
SOURCES += tst_qcomplextext.cpp
|
||||
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
SOURCES += tst_qdatetime.cpp
|
||||
QT = core
|
||||
QT = core core-private
|
||||
|
||||
# For some reason using optimization here triggers a compiler issue, which causes an exception
|
||||
# However, the code is correct
|
||||
|
@ -1,5 +1,5 @@
|
||||
load(qttest_p4)
|
||||
QT = core
|
||||
QT = core core-private
|
||||
contains(QT_CONFIG,dbus): {
|
||||
TEMPLATE = subdirs
|
||||
CONFIG += ordered
|
||||
|
@ -3,5 +3,4 @@ SOURCES += ../tst_qdbusabstractadaptor.cpp
|
||||
HEADERS += ../myobject.h
|
||||
TARGET = ../tst_qdbusabstractadaptor
|
||||
|
||||
QT = core
|
||||
QT += dbus
|
||||
QT = core core-private dbus
|
||||
|
@ -3,5 +3,4 @@ SOURCES += ../tst_qdbusinterface.cpp
|
||||
HEADERS += ../myobject.h
|
||||
TARGET = ../tst_qdbusinterface
|
||||
|
||||
QT = core
|
||||
QT += dbus
|
||||
QT = core core-private dbus
|
||||
|
@ -4,6 +4,8 @@ contains(QT_CONFIG,dbus): {
|
||||
CONFIG += ordered
|
||||
SUBDIRS = qpong test
|
||||
|
||||
QT += core-private
|
||||
|
||||
requires(contains(QT_CONFIG,private_tests))
|
||||
} else {
|
||||
SOURCES += dummy.cpp
|
||||
|
@ -2,7 +2,7 @@ load(qttest_p4)
|
||||
QT = core
|
||||
contains(QT_CONFIG,dbus): {
|
||||
SOURCES += tst_qdbusmetaobject.cpp
|
||||
QT += dbus
|
||||
QT += dbus dbus-private
|
||||
} else {
|
||||
SOURCES += ../qdbusmarshall/dummy.cpp
|
||||
}
|
||||
|
@ -1,8 +1,8 @@
|
||||
load(qttest_p4)
|
||||
QT = core
|
||||
QT = core core-private
|
||||
contains(QT_CONFIG,dbus): {
|
||||
SOURCES += tst_qdbustype.cpp
|
||||
QT += dbus
|
||||
QT += dbus dbus-private
|
||||
QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
|
||||
LIBS_PRIVATE += $$QT_LIBS_DBUS
|
||||
} else {
|
||||
|
@ -1,8 +1,8 @@
|
||||
load(qttest_p4)
|
||||
QT = core
|
||||
QT = core core-private
|
||||
contains(QT_CONFIG,dbus): {
|
||||
SOURCES += tst_qdbusxmlparser.cpp
|
||||
QT += dbus
|
||||
QT += dbus dbus-private
|
||||
} else {
|
||||
SOURCES += ../qdbusmarshall/dummy.cpp
|
||||
}
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qdockwidget.cpp
|
||||
|
||||
|
||||
|
@ -1,9 +1,7 @@
|
||||
############################################################
|
||||
# Project file for autotest for file qfiledialog.h
|
||||
############################################################
|
||||
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qfiledialog2.cpp
|
||||
|
||||
wince*|symbian {
|
||||
|
@ -3,6 +3,6 @@ load(qttest_p4)
|
||||
SOURCES += tst_qfilesystementry.cpp \
|
||||
../../../src/corelib/io/qfilesystementry.cpp
|
||||
HEADERS += ../../../src/corelib/io/qfilesystementry_p.h
|
||||
QT = core
|
||||
QT = core core-private
|
||||
|
||||
CONFIG += parallel_test
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qfontdialog.cpp
|
||||
|
||||
mac {
|
||||
|
@ -2,7 +2,7 @@ load(qttest_p4)
|
||||
SOURCES += tst_qftp.cpp
|
||||
|
||||
|
||||
QT = core network
|
||||
QT = core network network-private
|
||||
|
||||
wince*: {
|
||||
addFiles.files = rfc3252.txt
|
||||
|
@ -1,5 +1,5 @@
|
||||
load(qttest_p4)
|
||||
DEFINES += QT_STRICT_ITERATORS
|
||||
SOURCES += tst_qfuture.cpp
|
||||
QT = core
|
||||
QT = core core-private
|
||||
CONFIG += parallel_test
|
||||
|
@ -1,4 +1,4 @@
|
||||
load(qttest_p4)
|
||||
SOURCES += tst_qfuturewatcher.cpp
|
||||
QT = core
|
||||
QT = core core-private
|
||||
CONFIG += parallel_test
|
||||
|
@ -1,3 +1,6 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qgraphicseffect.cpp
|
||||
CONFIG += parallel_test
|
||||
|
@ -1,3 +1,6 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qgraphicseffectsource.cpp
|
||||
CONFIG += parallel_test
|
||||
|
@ -1,3 +1,6 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private
|
||||
|
||||
SOURCES += tst_qgraphicsobject.cpp
|
||||
CONFIG += parallel_test
|
||||
CONFIG += parallel_test
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qgraphicsproxywidget.cpp
|
||||
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp
|
||||
DEFINES += QT_NO_CAST_TO_ASCII
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qgraphicswidget.cpp
|
||||
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qgridlayout.cpp
|
||||
FORMS += sortdialog.ui
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qheaderview.cpp
|
||||
|
||||
|
||||
|
@ -1,6 +1,8 @@
|
||||
load(qttest_p4)
|
||||
SOURCES += tst_qimage.cpp
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
wince*: {
|
||||
addImages.files = images/*
|
||||
addImages.path = images
|
||||
|
@ -1,7 +1,7 @@
|
||||
load(qttest_p4)
|
||||
SOURCES += tst_qimagereader.cpp
|
||||
MOC_DIR=tmp
|
||||
QT += network
|
||||
QT += core-private gui-private network
|
||||
RESOURCES += qimagereader.qrc
|
||||
!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qkeysequence.cpp
|
||||
|
||||
RESOURCES += qkeysequence.qrc
|
||||
RESOURCES += qkeysequence.qrc
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qlabel.cpp
|
||||
wince*::DEFINES += SRCDIR=\\\"\\\"
|
||||
else:!symbian:DEFINES += SRCDIR=\\\"$$PWD/\\\"
|
||||
|
@ -1,9 +1,7 @@
|
||||
############################################################
|
||||
# Project file for autotest for file qlayout.h
|
||||
############################################################
|
||||
|
||||
load(qttest_p4)
|
||||
|
||||
QT += gui-private
|
||||
|
||||
SOURCES += tst_qlayout.cpp
|
||||
contains(QT_CONFIG, qt3support): QT += qt3support
|
||||
wince*|symbian: {
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += gui-private
|
||||
|
||||
INCLUDEPATH += .
|
||||
SOURCES += tst_qmdiarea.cpp
|
||||
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
|
||||
|
@ -1,5 +1,5 @@
|
||||
load(qttest_p4)
|
||||
SOURCES += tst_qnetworkcookiejar.cpp
|
||||
|
||||
QT = core network
|
||||
QT = core core-private network network-private
|
||||
symbian: TARGET.CAPABILITY = NetworkServices
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += gui-private
|
||||
|
||||
contains(QT_CONFIG, qt3support): QT += qt3support
|
||||
SOURCES += tst_qpainter.cpp
|
||||
wince*|symbian: {
|
||||
|
@ -1,5 +1,5 @@
|
||||
load(qttest_p4)
|
||||
QT = core gui
|
||||
QT = core core-private gui gui-private
|
||||
SOURCES += tst_qpauseanimation.cpp
|
||||
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qpixmap.cpp
|
||||
contains(QT_CONFIG, qt3support): QT += qt3support
|
||||
wince*|symbian: {
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += gui-private
|
||||
|
||||
SOURCES += tst_qpixmapfilter.cpp
|
||||
|
||||
wince*: {
|
||||
|
@ -1,5 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += gui-private
|
||||
|
||||
INCLUDEPATH += ../
|
||||
|
||||
HEADERS +=
|
||||
|
@ -1,5 +1,6 @@
|
||||
load(qttest_p4)
|
||||
QT = core gui
|
||||
|
||||
QT = core core-private gui gui-private
|
||||
|
||||
SOURCES += \
|
||||
tst_qrawfont.cpp
|
||||
|
@ -835,8 +835,8 @@ void tst_QRawFont::rawFontSetPixelSize()
|
||||
layout.createLine();
|
||||
layout.endLayout();
|
||||
|
||||
QGlyphs glyphs = layout.glyphs().at(0);
|
||||
QRawFont rawFont = glyphs.font();
|
||||
QGlyphRun glyphs = layout.glyphRuns().at(0);
|
||||
QRawFont rawFont = glyphs.rawFont();
|
||||
QCOMPARE(rawFont.pixelSize(), 12.0);
|
||||
|
||||
rawFont.setPixelSize(24);
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += gui-private
|
||||
|
||||
SOURCES += tst_qregion.cpp
|
||||
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
load(qttest_p4)
|
||||
SOURCES += tst_qringbuffer.cpp
|
||||
|
||||
QT = core
|
||||
QT = core core-private
|
||||
|
||||
|
||||
CONFIG += parallel_test
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private
|
||||
|
||||
SOURCES += tst_qsettings.cpp
|
||||
RESOURCES += qsettings.qrc
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
load(qttest_p4)
|
||||
SOURCES += tst_qsql.cpp
|
||||
|
||||
QT += sql
|
||||
QT += sql sql-private
|
||||
|
||||
contains(QT_CONFIG, qt3support): QT += qt3support
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qstandarditemmodel.cpp
|
||||
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
load(qttest_p4)
|
||||
QT = core gui
|
||||
QT = core core-private gui
|
||||
SOURCES += tst_qstatemachine.cpp
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
load(qttest_p4)
|
||||
QT = core gui
|
||||
QT = core core-private gui gui-private
|
||||
SOURCES += tst_qstatictext.cpp
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
TARGET.EPOCHEAPSIZE = 0x200000 0x800000
|
||||
SOURCES += tst_qtableview.cpp
|
||||
|
||||
|
@ -1,5 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += gui-private
|
||||
|
||||
INCLUDEPATH += ../
|
||||
|
||||
HEADERS +=
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += gui-private
|
||||
|
||||
SOURCES += tst_tessellator.cpp testtessellator.cpp oldtessellator.cpp utils.cpp simple.cpp dataparser.cpp arc.cpp
|
||||
HEADERS += oldtessellator.h testtessellator.h utils.h XRenderFake.h simple.h qnum.h dataparser.h arc.h
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qtextblock.cpp
|
||||
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
load(qttest_p4)
|
||||
QT += xml
|
||||
QT += core-private gui-private xml
|
||||
HEADERS += common.h
|
||||
SOURCES += tst_qtextdocument.cpp
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qtextdocumentfragment.cpp
|
||||
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qtextlist.cpp
|
||||
HEADERS += ../qtextdocument/common.h
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
HEADERS +=
|
||||
SOURCES += tst_qtextscriptengine.cpp
|
||||
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += gui-private
|
||||
|
||||
SOURCES += tst_qvolatileimage.cpp
|
||||
|
||||
symbian {
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
SOURCES += tst_qwidget.cpp
|
||||
RESOURCES = qwidget.qrc
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += gui-private
|
||||
|
||||
SOURCES += tst_qwindowsurface.cpp
|
||||
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
load(qttest_p4)
|
||||
SOURCES += tst_benchlibtickcounter.cpp
|
||||
QT = core
|
||||
QT = core testlib-private
|
||||
|
||||
mac:CONFIG -= app_bundle
|
||||
CONFIG -= debug_and_release_target
|
||||
|
@ -1,6 +1,6 @@
|
||||
load(qttest_p4)
|
||||
SOURCES += ../tst_selftests.cpp
|
||||
QT += core xml
|
||||
QT += core xml testlib-private
|
||||
|
||||
TARGET = ../tst_selftests
|
||||
|
||||
|
@ -3,10 +3,8 @@ SUBDIRS = \
|
||||
corelib \
|
||||
gui \
|
||||
network \
|
||||
script \
|
||||
svg
|
||||
|
||||
contains(QT_CONFIG, opengl): SUBDIRS += opengl
|
||||
contains(QT_CONFIG, declarative): SUBDIRS += declarative
|
||||
contains(QT_CONFIG, dbus): SUBDIRS += dbus
|
||||
|
||||
check-trusted.CONFIG += recursive
|
||||
|
@ -3,7 +3,7 @@ SUBDIRS = \
|
||||
qdir \
|
||||
qdiriterator \
|
||||
qfile \
|
||||
qfileinfo \
|
||||
#qfileinfo \ # FIXME: broken
|
||||
qiodevice \
|
||||
qtemporaryfile
|
||||
|
||||
|
@ -6,6 +6,8 @@ INCLUDEPATH += .
|
||||
|
||||
QT -= gui
|
||||
|
||||
QT += core-private
|
||||
|
||||
CONFIG += release
|
||||
|
||||
# Input
|
||||
|
@ -1,6 +1,7 @@
|
||||
load(qttest_p4)
|
||||
TARGET = tst_bench_qstring
|
||||
QT -= gui
|
||||
QT += core-private
|
||||
SOURCES += main.cpp data.cpp fromlatin1.cpp fromutf8.cpp
|
||||
|
||||
wince*:{
|
||||
|
@ -1,7 +1,7 @@
|
||||
load(qttest_p4)
|
||||
TARGET = tst_bench_qdbustype
|
||||
QT -= gui
|
||||
QT += dbus
|
||||
QT += dbus dbus-private
|
||||
QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
|
||||
LIBS_PRIVATE += $$QT_LIBS_DBUS
|
||||
|
||||
|
@ -1,3 +1,4 @@
|
||||
TEMPLATE = subdirs
|
||||
SUBDIRS = \
|
||||
GraphicsViewBenchmark
|
||||
#GraphicsViewBenchmark # FIXME: cannot be compiled by default as part of qtbase,
|
||||
# since it depends on qtsvg
|
||||
|
@ -3,7 +3,7 @@ SUBDIRS = \
|
||||
functional \
|
||||
qgraphicsanchorlayout \
|
||||
qgraphicsitem \
|
||||
qgraphicslayout \
|
||||
#qgraphicslayout \ # FIXME: broken
|
||||
qgraphicsscene \
|
||||
qgraphicsview \
|
||||
qgraphicswidget
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += gui-private
|
||||
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qpixmap
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += gui-private
|
||||
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_qpainter
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += core-private gui-private
|
||||
|
||||
TEMPLATE = app
|
||||
TARGET = tst_qtracebench
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
load(qttest_p4)
|
||||
|
||||
QT += gui-private
|
||||
|
||||
TEMPLATE = app
|
||||
TARGET = tst_bench_QText
|
||||
|
||||
@ -11,4 +14,4 @@ symbian* {
|
||||
DEPLOYMENT += addFiles
|
||||
} else {
|
||||
DEFINES += SRCDIR=\\\"$$PWD/\\\"
|
||||
}
|
||||
}
|
||||
|
@ -1,3 +1,4 @@
|
||||
TEMPLATE = subdirs
|
||||
SUBDIRS = \
|
||||
|
||||
contains(QT_CONFIG,private-tests):SUBDIRS += \
|
||||
qhostinfo
|
||||
|
@ -5,7 +5,7 @@ DEPENDPATH += .
|
||||
INCLUDEPATH += .
|
||||
|
||||
QT -= gui
|
||||
QT += network
|
||||
QT += core-private network network-private
|
||||
|
||||
CONFIG += release
|
||||
|
||||
|
@ -4,9 +4,9 @@ TARGET = tst_bench_opengl
|
||||
DEPENDPATH += .
|
||||
INCLUDEPATH += .
|
||||
|
||||
QT += opengl
|
||||
QT += core-private gui-private opengl opengl-private
|
||||
|
||||
# Input
|
||||
SOURCES += main.cpp
|
||||
|
||||
include(../trusted-benchmarks.pri)
|
||||
include(../trusted-benchmarks.pri)
|
||||
|
Loading…
Reference in New Issue
Block a user