diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-21 12:09:56 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-21 19:05:02 +0100 |
commit | 586adeabe4d58a7c8a71bbb1be79c3533ab858ff (patch) | |
tree | 62a13574bca965442bc1c66bd63d54550e3db7a0 /mkspecs | |
parent | 7706c31eaa686299d7e22da809fec00c0db47c86 (diff) |
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 <sergio.ahumada@digia.com>
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/ctest_testcase.prf | 2 | ||||
-rw-r--r-- | mkspecs/features/qt_functions.prf | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mkspecs/features/ctest_testcase.prf b/mkspecs/features/ctest_testcase.prf index 555a0bbe5c..93ebd4607d 100644 --- a/mkspecs/features/ctest_testcase.prf +++ b/mkspecs/features/ctest_testcase.prf @@ -53,6 +53,6 @@ insignificant_test:!isEmpty(check.commands) { check.commands = -$${check.commands} } -isEmpty(QT.widgets.name):CONFIG += insignificant_test # QTBUG-28540 +!qtHaveModule(widgets): CONFIG += insignificant_test # QTBUG-28540 QMAKE_EXTRA_TARGETS *= check diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 0bae5f3f87..389f2418ad 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -51,6 +51,13 @@ defineTest(qtProcessModuleFlags) { export($$1) } +# qt module +defineTest(qtHaveModule) { + !isEmpty(QT.$${1}.name): \ + return(true) + return(false) +} + # qt module, UsePrivate flag, libs variable defineTest(qtAddModule) { MODULE_NAME = $$eval(QT.$${1}.name) |