summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/gui
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2012-07-30 13:58:52 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-30 10:43:50 +0200
commit650cdb62bd9879f8e59f773282a3f9113cb03ab0 (patch)
treefe6408ca7608457495d8c2ebf0ccf344df1c3d79 /tests/benchmarks/gui
parentd294ac8d68ccc0e7b0880ef75dbe76846a7f200d (diff)
Make benchmarks compile without QtWidgets
Ensure benchmarks which need QtWidgets are gracefully disabled when that module is unavailable. Fixed one unnecessary usage of "QT+=widgets". Change-Id: I8031b5dca585749f0f4d22e0637adc3f57f4e418 Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Diffstat (limited to 'tests/benchmarks/gui')
-rw-r--r--tests/benchmarks/gui/animation/animation.pro2
-rw-r--r--tests/benchmarks/gui/graphicsview/graphicsview.pro7
-rw-r--r--tests/benchmarks/gui/gui.pro3
-rw-r--r--tests/benchmarks/gui/image/image.pro3
-rw-r--r--tests/benchmarks/gui/kernel/kernel.pro2
-rw-r--r--tests/benchmarks/gui/painting/painting.pro5
-rw-r--r--tests/benchmarks/gui/styles/styles.pro2
-rw-r--r--tests/benchmarks/gui/text/qtext/qtext.pro4
8 files changed, 23 insertions, 5 deletions
diff --git a/tests/benchmarks/gui/animation/animation.pro b/tests/benchmarks/gui/animation/animation.pro
index a4ba273fec..1c9a7c3c08 100644
--- a/tests/benchmarks/gui/animation/animation.pro
+++ b/tests/benchmarks/gui/animation/animation.pro
@@ -1,2 +1,2 @@
TEMPLATE = subdirs
-SUBDIRS = qanimation
+!isEmpty(QT.widgets.name):SUBDIRS = qanimation
diff --git a/tests/benchmarks/gui/graphicsview/graphicsview.pro b/tests/benchmarks/gui/graphicsview/graphicsview.pro
index 4a85df812e..f8ba062829 100644
--- a/tests/benchmarks/gui/graphicsview/graphicsview.pro
+++ b/tests/benchmarks/gui/graphicsview/graphicsview.pro
@@ -7,3 +7,10 @@ SUBDIRS = \
qgraphicsscene \
qgraphicsview \
qgraphicswidget
+
+isEmpty(QT.widgets.name): SUBDIRS -= \
+ qgraphicsanchorlayout \
+ qgraphicsitem \
+ qgraphicsscene \
+ qgraphicsview \
+ qgraphicswidget
diff --git a/tests/benchmarks/gui/gui.pro b/tests/benchmarks/gui/gui.pro
index 9cf701fa33..f4b84f0428 100644
--- a/tests/benchmarks/gui/gui.pro
+++ b/tests/benchmarks/gui/gui.pro
@@ -16,3 +16,6 @@ TRUSTED_BENCHMARKS += \
painting/qtracebench
include(../trusted-benchmarks.pri)
+
+isEmpty(QT.widgets.name): SUBDIRS -= \
+ itemviews
diff --git a/tests/benchmarks/gui/image/image.pro b/tests/benchmarks/gui/image/image.pro
index a8c6732413..fa26f3ec4c 100644
--- a/tests/benchmarks/gui/image/image.pro
+++ b/tests/benchmarks/gui/image/image.pro
@@ -5,3 +5,6 @@ SUBDIRS = \
qimagereader \
qpixmap \
qpixmapcache
+
+isEmpty(QT.widgets.name): SUBDIRS -= \
+ qimagereader
diff --git a/tests/benchmarks/gui/kernel/kernel.pro b/tests/benchmarks/gui/kernel/kernel.pro
index a50aad2014..303eff9759 100644
--- a/tests/benchmarks/gui/kernel/kernel.pro
+++ b/tests/benchmarks/gui/kernel/kernel.pro
@@ -1,4 +1,4 @@
TEMPLATE = subdirs
-SUBDIRS = \
+!isEmpty(QT.widgets.name):SUBDIRS = \
qapplication \
qwidget
diff --git a/tests/benchmarks/gui/painting/painting.pro b/tests/benchmarks/gui/painting/painting.pro
index 76c26c1627..e55222a2c2 100644
--- a/tests/benchmarks/gui/painting/painting.pro
+++ b/tests/benchmarks/gui/painting/painting.pro
@@ -5,3 +5,8 @@ SUBDIRS = \
qtransform \
qtracebench \
qtbench
+
+isEmpty(QT.widgets.name): SUBDIRS -= \
+ qpainter \
+ qtracebench \
+ qtbench
diff --git a/tests/benchmarks/gui/styles/styles.pro b/tests/benchmarks/gui/styles/styles.pro
index 7c1d0697b7..8930de127b 100644
--- a/tests/benchmarks/gui/styles/styles.pro
+++ b/tests/benchmarks/gui/styles/styles.pro
@@ -1,3 +1,3 @@
TEMPLATE = subdirs
-SUBDIRS = \
+!isEmpty(QT.widgets.name):SUBDIRS = \
qstylesheetstyle
diff --git a/tests/benchmarks/gui/text/qtext/qtext.pro b/tests/benchmarks/gui/text/qtext/qtext.pro
index 084cf858fd..d5597fb097 100644
--- a/tests/benchmarks/gui/text/qtext/qtext.pro
+++ b/tests/benchmarks/gui/text/qtext/qtext.pro
@@ -1,5 +1,5 @@
-QT += widgets testlib
-QT += gui-private widgets-private
+QT += testlib
+QT += gui-private
TEMPLATE = app
TARGET = tst_bench_QText