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 <[email protected]>
Reviewed-by: Sergio Ahumada <[email protected]>

9 files changed, 27 insertions, 5 deletions

diff --git a/tests/benchmarks/corelib/kernel/kernel.pro b/tests/benchmarks/corelib/kernel/kernel.pro
index 8b7d8c8f90a..a55135b74d8 100644
--- 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
diff --git a/tests/benchmarks/gui/animation/animation.pro b/tests/benchmarks/gui/animation/animation.pro
index a4ba273fec7..1c9a7c3c087 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 4a85df812ee..f8ba0628294 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 9cf701fa335..f4b84f04289 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 a8c6732413d..fa26f3ec4c1 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 a50aad20141..303eff97592 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 76c26c16278..e55222a2c21 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 7c1d0697b7e..8930de127b4 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 084cf858fd7..d5597fb0971 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