From 63b6e19704db059c9aece410ef8f36596f6b5580 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 21 Dec 2012 10:55:27 +0100 Subject: make use of qtHaveModule() Change-Id: I23f11c944fafb5863a960dcc83bc1e57e189f662 Reviewed-by: Sergio Ahumada Reviewed-by: Tasuku Suzuki Reviewed-by: Joerg Bornemann --- src/imports/imports.pro | 4 ++-- src/plugins/accessible/accessible.pro | 2 +- src/plugins/qmltooling/qmltooling.pro | 2 +- src/src.pro | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 601e9c7e52..72888b2c71 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -4,7 +4,7 @@ SUBDIRS += \ folderlistmodel \ localstorage -!isEmpty(QT.quick.name) { +qtHaveModule(quick) { SUBDIRS += \ qtquick2 \ particles \ @@ -12,4 +12,4 @@ SUBDIRS += \ testlib } -contains(QT_CONFIG, xmlpatterns) : SUBDIRS += xmllistmodel +qtHaveModule(xmlpatterns) : SUBDIRS += xmllistmodel diff --git a/src/plugins/accessible/accessible.pro b/src/plugins/accessible/accessible.pro index bff65070c1..b97d323a08 100644 --- a/src/plugins/accessible/accessible.pro +++ b/src/plugins/accessible/accessible.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -!isEmpty(QT.quick.name): SUBDIRS += quick +qtHaveModule(quick): SUBDIRS += quick diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro index 3b6a908469..3bc48a6b33 100644 --- a/src/plugins/qmltooling/qmltooling.pro +++ b/src/plugins/qmltooling/qmltooling.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs SUBDIRS = qmldbg_tcp -!isEmpty(QT.quick.name): SUBDIRS += qmldbg_qtquick2 +qtHaveModule(quick): SUBDIRS += qmldbg_qtquick2 diff --git a/src/src.pro b/src/src.pro index 80d859ff49..f593eb8968 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,7 +3,7 @@ CONFIG += ordered SUBDIRS += \ qml -!isEmpty(QT.gui.name) { +qtHaveModule(gui) { SUBDIRS += \ quick \ qmltest \ -- cgit v1.2.3