diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-21 10:57:38 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-08 11:06:50 +0100 |
| commit | ac83b242c26d5b8750b6bf0f9ed0bac0e4569b6c (patch) | |
| tree | 03bbf9219cb04304040131e3ad0fd9d9f74aff3a | |
| parent | 0ad2be463848898235abd8ebeebc076042cf398f (diff) | |
| download | qtlocation-ac83b242c26d5b8750b6bf0f9ed0bac0e4569b6c.tar.gz | |
make use of qtHaveModule()
Change-Id: Ifd6b6040bd00357bf658f5b51215d4208823bab1
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | doc/doc.pro | 2 | ||||
| -rw-r--r-- | examples/declarative/declarative.pro | 2 | ||||
| -rw-r--r-- | examples/examples.pro | 4 | ||||
| -rw-r--r-- | src/plugins/geoservices/geoservices.pro | 2 | ||||
| -rw-r--r-- | src/src.pro | 2 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/doc/doc.pro b/doc/doc.pro index 94ad926c..1d660174 100644 --- a/doc/doc.pro +++ b/doc/doc.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs # Doc snippets use widgets -!isEmpty(QT.widgets.name): SUBDIRS += src/snippets +qtHaveModule(widgets): SUBDIRS += src/snippets diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro index 4eae9e65..64e6e1b9 100644 --- a/examples/declarative/declarative.pro +++ b/examples/declarative/declarative.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs SUBDIRS += flickr places places_list places_map -!isEmpty(QT.multimedia.name):SUBDIRS += mapviewer +qtHaveModule(multimedia): SUBDIRS += mapviewer diff --git a/examples/examples.pro b/examples/examples.pro index babe1b68..fa19990e 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs -!isEmpty(QT.quick.name): SUBDIRS += declarative weatherinfo -!contains(QT_CONFIG, no-widgets): SUBDIRS += logfilepositionsource +qtHaveModule(quick): SUBDIRS += declarative weatherinfo +qtHaveModule(widgets): SUBDIRS += logfilepositionsource diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro index c93e578e..4daac38c 100644 --- a/src/plugins/geoservices/geoservices.pro +++ b/src/plugins/geoservices/geoservices.pro @@ -2,4 +2,4 @@ TEMPLATE = subdirs SUBDIRS = nokia -!isEmpty(QT.jsondb.name):SUBDIRS += places_jsondb +qtHaveModule(jsondb): SUBDIRS += places_jsondb diff --git a/src/src.pro b/src/src.pro index 676d30d8..8895e83a 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,5 +2,5 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS += 3rdparty location plugins -!isEmpty(QT.quick.name): SUBDIRS += imports +qtHaveModule(quick): SUBDIRS += imports diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 5d078331..88adb7d4 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -67,4 +67,4 @@ SUBDIRS += geotestplugin \ !mac: SUBDIRS += declarative_ui -!isEmpty(QT.jsondb.name):SUBDIRS += qplacemanager_jsondb +qtHaveModule(jsondb): SUBDIRS += qplacemanager_jsondb |