From ce26a6fd2bfa3241fa801ebf28b61d740be1f1b4 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Wed, 11 May 2011 14:00:53 +1000 Subject: tests: make benchmarks compile or disable those which don't compile Reviewed-by: Jason McDonald Change-Id: Idc9fa4722b59f9b75d5e4a91bbfd0ae068d29b3d --- tests/benchmarks/corelib/io/io.pro | 2 +- tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro | 2 ++ tests/benchmarks/corelib/tools/qstring/qstring.pro | 1 + tests/benchmarks/dbus/qdbustype/qdbustype.pro | 2 +- tests/benchmarks/gui/graphicsview/functional/functional.pro | 3 ++- tests/benchmarks/gui/graphicsview/graphicsview.pro | 2 +- tests/benchmarks/gui/image/qpixmap/qpixmap.pro | 3 +++ tests/benchmarks/gui/painting/qpainter/qpainter.pro | 3 +++ tests/benchmarks/gui/painting/qtracebench/qtracebench.pro | 3 +++ tests/benchmarks/gui/text/qtext/qtext.pro | 5 ++++- tests/benchmarks/network/kernel/kernel.pro | 3 ++- tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro | 2 +- tests/benchmarks/opengl/opengl.pro | 4 ++-- 13 files changed, 26 insertions(+), 9 deletions(-) diff --git a/tests/benchmarks/corelib/io/io.pro b/tests/benchmarks/corelib/io/io.pro index 97445d7c6c..15ae0d2101 100644 --- a/tests/benchmarks/corelib/io/io.pro +++ b/tests/benchmarks/corelib/io/io.pro @@ -3,7 +3,7 @@ SUBDIRS = \ qdir \ qdiriterator \ qfile \ - qfileinfo \ + #qfileinfo \ # FIXME: broken qiodevice \ qtemporaryfile diff --git a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro index 3edf6a65c8..b628c0af41 100644 --- a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro +++ b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro @@ -6,6 +6,8 @@ INCLUDEPATH += . QT -= gui +QT += core-private + CONFIG += release # Input diff --git a/tests/benchmarks/corelib/tools/qstring/qstring.pro b/tests/benchmarks/corelib/tools/qstring/qstring.pro index 5db9776b09..7460f8a4e4 100644 --- a/tests/benchmarks/corelib/tools/qstring/qstring.pro +++ b/tests/benchmarks/corelib/tools/qstring/qstring.pro @@ -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*:{ diff --git a/tests/benchmarks/dbus/qdbustype/qdbustype.pro b/tests/benchmarks/dbus/qdbustype/qdbustype.pro index d480a05f38..2f3edf074b 100644 --- a/tests/benchmarks/dbus/qdbustype/qdbustype.pro +++ b/tests/benchmarks/dbus/qdbustype/qdbustype.pro @@ -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 diff --git a/tests/benchmarks/gui/graphicsview/functional/functional.pro b/tests/benchmarks/gui/graphicsview/functional/functional.pro index f8e122be89..3c2979448b 100644 --- a/tests/benchmarks/gui/graphicsview/functional/functional.pro +++ b/tests/benchmarks/gui/graphicsview/functional/functional.pro @@ -1,3 +1,4 @@ TEMPLATE = subdirs SUBDIRS = \ - GraphicsViewBenchmark + #GraphicsViewBenchmark # FIXME: cannot be compiled by default as part of qtbase, + # since it depends on qtsvg diff --git a/tests/benchmarks/gui/graphicsview/graphicsview.pro b/tests/benchmarks/gui/graphicsview/graphicsview.pro index 1509466728..4a85df812e 100644 --- a/tests/benchmarks/gui/graphicsview/graphicsview.pro +++ b/tests/benchmarks/gui/graphicsview/graphicsview.pro @@ -3,7 +3,7 @@ SUBDIRS = \ functional \ qgraphicsanchorlayout \ qgraphicsitem \ - qgraphicslayout \ + #qgraphicslayout \ # FIXME: broken qgraphicsscene \ qgraphicsview \ qgraphicswidget diff --git a/tests/benchmarks/gui/image/qpixmap/qpixmap.pro b/tests/benchmarks/gui/image/qpixmap/qpixmap.pro index 201ac9ea99..72ce42faf4 100644 --- a/tests/benchmarks/gui/image/qpixmap/qpixmap.pro +++ b/tests/benchmarks/gui/image/qpixmap/qpixmap.pro @@ -1,4 +1,7 @@ load(qttest_p4) + +QT += gui-private + TEMPLATE = app TARGET = tst_bench_qpixmap diff --git a/tests/benchmarks/gui/painting/qpainter/qpainter.pro b/tests/benchmarks/gui/painting/qpainter/qpainter.pro index 6603abafea..78b4f1a4e5 100644 --- a/tests/benchmarks/gui/painting/qpainter/qpainter.pro +++ b/tests/benchmarks/gui/painting/qpainter/qpainter.pro @@ -1,4 +1,7 @@ load(qttest_p4) + +QT += gui-private + TEMPLATE = app TARGET = tst_bench_qpainter diff --git a/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro b/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro index 56ec8bbe4e..4f527f62b3 100644 --- a/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro +++ b/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro @@ -1,4 +1,7 @@ load(qttest_p4) + +QT += core-private gui-private + TEMPLATE = app TARGET = tst_qtracebench diff --git a/tests/benchmarks/gui/text/qtext/qtext.pro b/tests/benchmarks/gui/text/qtext/qtext.pro index 1c18302a39..27465b0897 100644 --- a/tests/benchmarks/gui/text/qtext/qtext.pro +++ b/tests/benchmarks/gui/text/qtext/qtext.pro @@ -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/\\\" -} \ No newline at end of file +} diff --git a/tests/benchmarks/network/kernel/kernel.pro b/tests/benchmarks/network/kernel/kernel.pro index 1ec3071f03..02e6854f4a 100644 --- a/tests/benchmarks/network/kernel/kernel.pro +++ b/tests/benchmarks/network/kernel/kernel.pro @@ -1,3 +1,4 @@ TEMPLATE = subdirs -SUBDIRS = \ + +contains(QT_CONFIG,private-tests):SUBDIRS += \ qhostinfo diff --git a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro index e621d50e45..d456620d5a 100755 --- a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro +++ b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro @@ -5,7 +5,7 @@ DEPENDPATH += . INCLUDEPATH += . QT -= gui -QT += network +QT += core-private network network-private CONFIG += release diff --git a/tests/benchmarks/opengl/opengl.pro b/tests/benchmarks/opengl/opengl.pro index b510c2bb06..8646413bc7 100644 --- a/tests/benchmarks/opengl/opengl.pro +++ b/tests/benchmarks/opengl/opengl.pro @@ -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) \ No newline at end of file +include(../trusted-benchmarks.pri) -- cgit v1.2.3