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 /tests/auto/tools | |
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 'tests/auto/tools')
-rw-r--r-- | tests/auto/tools/moc/moc.pro | 2 | ||||
-rw-r--r-- | tests/auto/tools/tools.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/tools/moc/moc.pro b/tests/auto/tools/moc/moc.pro index d91ae378da..772086d3c4 100644 --- a/tests/auto/tools/moc/moc.pro +++ b/tests/auto/tools/moc/moc.pro @@ -31,7 +31,7 @@ SOURCES += tst_moc.cpp QT -= gui QT += sql network testlib -contains(QT_CONFIG, dbus){ +qtHaveModule(dbus) { DEFINES += WITH_DBUS QT += dbus } diff --git a/tests/auto/tools/tools.pro b/tests/auto/tools/tools.pro index 4cc3d62a43..9b4d2ca22a 100644 --- a/tests/auto/tools/tools.pro +++ b/tests/auto/tools/tools.pro @@ -5,4 +5,4 @@ SUBDIRS=\ moc \ rcc \ -contains(QT_CONFIG, dbus):SUBDIRS += qdbuscpp2xml qdbusxml2cpp +qtHaveModule(dbus): SUBDIRS += qdbuscpp2xml qdbusxml2cpp |