From 586adeabe4d58a7c8a71bbb1be79c3533ab858ff Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 21 Dec 2012 12:09:56 +0100 Subject: add and use qtHaveModule() function this is much more elegant than the so far propagated !isEmpty(QT.foo.name). also replace feature-specific tests (no-gui and no-widgets) and the obsolete contains(QT_CONFIG, foo) syntax. Change-Id: Ia4b3c8febcabf9eeca67b1f9173a523820b1038b Reviewed-by: Sergio Ahumada Reviewed-by: Tasuku Suzuki Reviewed-by: Oswald Buddenhagen --- tests/auto/corelib/animation/animation.pro | 2 +- tests/auto/corelib/io/qprocess/qprocess.pri | 2 +- tests/auto/corelib/itemmodels/itemmodels.pro | 2 +- tests/auto/corelib/kernel/qpointer/qpointer.pro | 2 +- tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/auto/corelib') diff --git a/tests/auto/corelib/animation/animation.pro b/tests/auto/corelib/animation/animation.pro index 563b7184bf..30c98f4a11 100644 --- a/tests/auto/corelib/animation/animation.pro +++ b/tests/auto/corelib/animation/animation.pro @@ -8,5 +8,5 @@ SUBDIRS=\ qsequentialanimationgroup \ qvariantanimation -contains(QT_CONFIG, no-widgets): SUBDIRS -= \ +!qtHaveModule(widgets): SUBDIRS -= \ qpropertyanimation diff --git a/tests/auto/corelib/io/qprocess/qprocess.pri b/tests/auto/corelib/io/qprocess/qprocess.pri index d139b3dcef..430251fbf1 100644 --- a/tests/auto/corelib/io/qprocess/qprocess.pri +++ b/tests/auto/corelib/io/qprocess/qprocess.pri @@ -17,5 +17,5 @@ SUBPROGRAMS = \ !contains(QMAKE_PLATFORM, wince): SUBPROGRAMS += testForwarding -contains(QT_CONFIG, no-widgets): SUBPROGRAMS -= \ +!qtHaveModule(widgets): SUBPROGRAMS -= \ testGuiProcess diff --git a/tests/auto/corelib/itemmodels/itemmodels.pro b/tests/auto/corelib/itemmodels/itemmodels.pro index 5221bfae81..2f681c3330 100644 --- a/tests/auto/corelib/itemmodels/itemmodels.pro +++ b/tests/auto/corelib/itemmodels/itemmodels.pro @@ -3,7 +3,7 @@ TEMPLATE=subdirs SUBDIRS = qabstractitemmodel \ qstringlistmodel -!contains(QT_CONFIG, no-widgets): SUBDIRS += \ +qtHaveModule(widgets): SUBDIRS += \ qabstractproxymodel \ qidentityproxymodel \ qitemmodel \ diff --git a/tests/auto/corelib/kernel/qpointer/qpointer.pro b/tests/auto/corelib/kernel/qpointer/qpointer.pro index 6c076e630f..8786d07292 100644 --- a/tests/auto/corelib/kernel/qpointer/qpointer.pro +++ b/tests/auto/corelib/kernel/qpointer/qpointer.pro @@ -2,6 +2,6 @@ CONFIG += testcase CONFIG += parallel_test TARGET = tst_qpointer QT += testlib -!contains(QT_CONFIG, no-widgets): QT += widgets +qtHaveModule(widgets): QT += widgets SOURCES = tst_qpointer.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro b/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro index 1708735c52..b830efe3a5 100644 --- a/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro +++ b/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro @@ -2,6 +2,6 @@ CONFIG += testcase CONFIG += parallel_test TARGET = tst_qstatemachine QT = core-private testlib gui -!contains(QT_CONFIG, no-widgets): QT += widgets +qtHaveModule(widgets): QT += widgets SOURCES = tst_qstatemachine.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3