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 --- src/platformsupport/linuxaccessibility/linuxaccessibility.pri | 2 +- src/plugins/bearer/bearer.pro | 2 +- src/plugins/platforminputcontexts/platforminputcontexts.pro | 2 +- src/plugins/platforms/cocoa/cocoa.pro | 2 +- src/plugins/plugins.pro | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/platformsupport/linuxaccessibility/linuxaccessibility.pri b/src/platformsupport/linuxaccessibility/linuxaccessibility.pri index 85a02da004..09d437678f 100644 --- a/src/platformsupport/linuxaccessibility/linuxaccessibility.pri +++ b/src/platformsupport/linuxaccessibility/linuxaccessibility.pri @@ -1,4 +1,4 @@ -contains(QT_CONFIG, dbus):contains(QT_CONFIG, xcb):contains(QT_CONFIG, accessibility) { +qtHaveModule(dbus):contains(QT_CONFIG, xcb):contains(QT_CONFIG, accessibility) { QT += dbus include(../../3rdparty/atspi2/atspi2.pri) diff --git a/src/plugins/bearer/bearer.pro b/src/plugins/bearer/bearer.pro index 899eede7bf..0375500306 100644 --- a/src/plugins/bearer/bearer.pro +++ b/src/plugins/bearer/bearer.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -linux*:contains(QT_CONFIG, dbus) { +linux*:qtHaveModule(dbus) { SUBDIRS += generic SUBDIRS += connman networkmanager } diff --git a/src/plugins/platforminputcontexts/platforminputcontexts.pro b/src/plugins/platforminputcontexts/platforminputcontexts.pro index 7c1f55927d..c8449e7e44 100644 --- a/src/plugins/platforminputcontexts/platforminputcontexts.pro +++ b/src/plugins/platforminputcontexts/platforminputcontexts.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs -contains(QT_CONFIG, dbus) { +qtHaveModule(dbus) { !macx:!win32:SUBDIRS += ibus maliit } diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index 85e3f0007c..83e2a88e6a 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -82,7 +82,7 @@ LIBS += -framework Cocoa -framework IOKit QT += core-private gui-private platformsupport-private -!contains(QT_CONFIG, no-widgets) { +qtHaveModule(widgets) { OBJECTIVE_SOURCES += \ qpaintengine_mac.mm \ qprintengine_mac.mm \ diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index b056fa4002..3b0ff3f6c8 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs SUBDIRS *= sqldrivers bearer -!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats platforms platforminputcontexts generic -!contains(QT_CONFIG, no-widgets): SUBDIRS += accessible +qtHaveModule(gui): SUBDIRS *= imageformats platforms platforminputcontexts generic +qtHaveModule(widgets): SUBDIRS += accessible -!wince*:!contains(QT_CONFIG, no-widgets):SUBDIRS += printsupport +!wince*:qtHaveModule(widgets): SUBDIRS += printsupport -- cgit v1.2.3