summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-12-21 11:41:56 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-13 16:49:51 +0100
commit6c1575ae85ed0636256a140c687e31bc8233e588 (patch)
treea4c2da9001904e8d293eb86401349c20a95524ef
parent2d5bce5e9310eb9df247b03ae26695a3489dfb88 (diff)
make use of qtHaveModule()
Change-Id: I167c7c2e290afb7e4ab12ab08dc1dbfb9b6eb7fc Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
-rw-r--r--src/gallery/gallery.pro2
-rw-r--r--tests/auto/auto.pro2
-rw-r--r--tests/auto/qdocumentgallery/qdocumentgallery.pro2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gallery/gallery.pro b/src/gallery/gallery.pro
index 1fa2617..e38392d 100644
--- a/src/gallery/gallery.pro
+++ b/src/gallery/gallery.pro
@@ -45,7 +45,7 @@ OTHER_FILES = \
qgallerytype.qdoc
linux-* {
- contains(QT_CONFIG, dbus): contains(tracker_enabled, yes): {
+ qtHaveModule(dbus):contains(tracker_enabled, yes) {
include (tracker/tracker.pri)
} else: {
DEFINES += QT_DOCUMENT_GALLERY_NULL
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index be09913..8d60163 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -14,7 +14,7 @@ SUBDIRS += \
# qdeclarativedocumentgallerymodel \
# qdeclarativedocumentgallerytype
-linux-*: contains(QT_CONFIG, dbus): contains(tracker_enabled, yes) {
+linux-*:qtHaveModule(dbus):contains(tracker_enabled, yes) {
SUBDIRS += \
# qgallerytrackerresultset_tracker \
# qgallerytrackerschema_tracker
diff --git a/tests/auto/qdocumentgallery/qdocumentgallery.pro b/tests/auto/qdocumentgallery/qdocumentgallery.pro
index d217a9d..faf172b 100644
--- a/tests/auto/qdocumentgallery/qdocumentgallery.pro
+++ b/tests/auto/qdocumentgallery/qdocumentgallery.pro
@@ -3,6 +3,6 @@ include(../auto.pri)
SOURCES += tst_qdocumentgallery.cpp
linux-*: {
- contains(QT_CONFIG, dbus): contains(tracker_enabled, yes): DEFINES += QT_TRACKER_ENABLED
+ qtHaveModule(dbus):contains(tracker_enabled, yes): DEFINES += QT_TRACKER_ENABLED
}
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0