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>
This commit is contained in:
Rohan McGovern 2012-07-30 13:58:52 +10:00 committed by Qt by Nokia
parent d294ac8d68
commit 650cdb62bd
9 changed files with 27 additions and 5 deletions

View File

@ -6,3 +6,7 @@ SUBDIRS = \
qobject \
qvariant \
qcoreapplication
isEmpty(QT.widgets.name): SUBDIRS -= \
qmetaobject \
qobject

View File

@ -1,2 +1,2 @@
TEMPLATE = subdirs
SUBDIRS = qanimation
!isEmpty(QT.widgets.name):SUBDIRS = qanimation

View File

@ -7,3 +7,10 @@ SUBDIRS = \
qgraphicsscene \
qgraphicsview \
qgraphicswidget
isEmpty(QT.widgets.name): SUBDIRS -= \
qgraphicsanchorlayout \
qgraphicsitem \
qgraphicsscene \
qgraphicsview \
qgraphicswidget

View File

@ -16,3 +16,6 @@ TRUSTED_BENCHMARKS += \
painting/qtracebench
include(../trusted-benchmarks.pri)
isEmpty(QT.widgets.name): SUBDIRS -= \
itemviews

View File

@ -5,3 +5,6 @@ SUBDIRS = \
qimagereader \
qpixmap \
qpixmapcache
isEmpty(QT.widgets.name): SUBDIRS -= \
qimagereader

View File

@ -1,4 +1,4 @@
TEMPLATE = subdirs
SUBDIRS = \
!isEmpty(QT.widgets.name):SUBDIRS = \
qapplication \
qwidget

View File

@ -5,3 +5,8 @@ SUBDIRS = \
qtransform \
qtracebench \
qtbench
isEmpty(QT.widgets.name): SUBDIRS -= \
qpainter \
qtracebench \
qtbench

View File

@ -1,3 +1,3 @@
TEMPLATE = subdirs
SUBDIRS = \
!isEmpty(QT.widgets.name):SUBDIRS = \
qstylesheetstyle

View File

@ -1,5 +1,5 @@
QT += widgets testlib
QT += gui-private widgets-private
QT += testlib
QT += gui-private
TEMPLATE = app
TARGET = tst_bench_QText