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>
2012-07-30 13:58:52 +10:00 · 2012-07-30 13:58:52 +10:00 · 650cdb62bd
commit 650cdb62bd
parent d294ac8d68
9 changed files with 27 additions and 5 deletions
--- a/tests/benchmarks/corelib/kernel/kernel.pro
+++ b/tests/benchmarks/corelib/kernel/kernel.pro
@ -6,3 +6,7 @@ SUBDIRS = \
        qobject \
        qvariant \
        qcoreapplication
+
+isEmpty(QT.widgets.name): SUBDIRS -= \
+    qmetaobject \
+    qobject
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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