make use of qtHaveModule()

Change-Id: I23f11c944fafb5863a960dcc83bc1e57e189f662
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

diff --git a/examples/qml/referenceexamples/referenceexamples.pro b/examples/qml/referenceexamples/referenceexamples.pro
index 4bfbd48..ae3b884 100644 (file)
--- a/examples/qml/referenceexamples/referenceexamples.pro
+++ b/examples/qml/referenceexamples/referenceexamples.pro
@@ -12,4 +12,4 @@ SUBDIRS += \
     valuesource \
     methods
 
-!contains(QT_CONFIG, no-widgets): SUBDIRS += extended
+qtHaveModule(widgets): SUBDIRS += extended

diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 601e9c7..72888b2 100644 (file)
--- 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 bff6507..b97d323 100644 (file)
--- 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 3b6a908..3bc48a6 100644 (file)
--- 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 80d859f..f593eb8 100644 (file)
--- 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 \

diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index bbef361..b77effe 100644 (file)
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -53,7 +53,7 @@ PRIVATETESTS += \
     v4 \
     qqmltimer
 
-!contains(QT_CONFIG, no-widgets) {
+qtHaveModule(widgets) {
     PUBLICTESTS += \
         qjsengine \
         qjsvalue

diff --git a/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro b/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro
index 4aff6cf..bc55ed9 100644 (file)
--- a/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro
+++ b/tests/auto/qml/qqmlecmascript/qqmlecmascript.pro
@@ -17,6 +17,6 @@ include (../../shared/util.pri)
 TESTDATA = data/*
 
 QT += core-private gui-private v8-private qml-private network testlib
-!contains(QT_CONFIG, no-widgets): QT += widgets
+qtHaveModule(widgets): QT += widgets
 
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

diff --git a/tests/auto/quick/qquickpathview/qquickpathview.pro b/tests/auto/quick/qquickpathview/qquickpathview.pro
index bd9cc25..fb02cae 100644 (file)
--- a/tests/auto/quick/qquickpathview/qquickpathview.pro
+++ b/tests/auto/quick/qquickpathview/qquickpathview.pro
@@ -10,5 +10,5 @@ include (../shared/util.pri)
 TESTDATA = data/*
 
 QT += core-private gui-private v8-private qml-private quick-private testlib
-!contains(QT_CONFIG, no-widgets): QT += widgets
+qtHaveModule(widgets): QT += widgets
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

diff --git a/tests/auto/quick/qquicksystempalette/qquicksystempalette.pro b/tests/auto/quick/qquicksystempalette/qquicksystempalette.pro
index b6c0947..48fd7e8 100644 (file)
--- a/tests/auto/quick/qquicksystempalette/qquicksystempalette.pro
+++ b/tests/auto/quick/qquicksystempalette/qquicksystempalette.pro
@@ -6,5 +6,5 @@ SOURCES += tst_qquicksystempalette.cpp
 
 CONFIG += parallel_test
 QT += core-private gui-private qml-private quick-private testlib
-!contains(QT_CONFIG, no-widgets): QT += widgets
+qtHaveModule(widgets): QT += widgets
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

diff --git a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
index d03cfaa..60ae065 100644 (file)
--- a/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
+++ b/tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
@@ -12,5 +12,5 @@ TESTDATA = data/*
 CONFIG += parallel_test
 
 QT += core-private gui-private v8-private qml-private quick-private testlib
-!contains(QT_CONFIG, no-widgets): QT += widgets
+qtHaveModule(widgets): QT += widgets
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 5f18fc9..9600d0c 100644 (file)
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -5,12 +5,12 @@ PUBLICTESTS += \
     rendernode \
     qquickpixmapcache
 
-!contains(QT_CONFIG, no-widgets): PUBLICTESTS += nodes
+qtHaveModule(widgets): PUBLICTESTS += nodes
 
 !cross_compile: PUBLICTESTS += examples
 
 # This test requires the qtconcurrent module
-!contains(QT_CONFIG, concurrent):PUBLICTESTS -= qquickpixmapcache
+!qtHaveModule(concurrent): PUBLICTESTS -= qquickpixmapcache
 
 PRIVATETESTS += \
     qquickanimations \
@@ -28,7 +28,7 @@ PRIVATETESTS += \
     qquickxmllistmodel
 
 # This test requires the xmlpatterns module
-!contains(QT_CONFIG,xmlpatterns):PRIVATETESTS -= qquickxmllistmodel
+!qtHaveModule(xmlpatterns): PRIVATETESTS -= qquickxmllistmodel
 
 QUICKTESTS =  \
     qquickaccessible \

diff --git a/tests/benchmarks/qml/painting/painting.pro b/tests/benchmarks/qml/painting/painting.pro
index 3f05185..bde891e 100644 (file)
--- a/tests/benchmarks/qml/painting/painting.pro
+++ b/tests/benchmarks/qml/painting/painting.pro
@@ -1,4 +1,4 @@
-requires(contains(QT_CONFIG,opengl))
+requires(qtHaveModule(opengl))
 
 QT += opengl
 CONFIG += console

diff --git a/tests/benchmarks/qml/qml.pro b/tests/benchmarks/qml/qml.pro
index 3fbf130..c50f57b 100644 (file)
--- a/tests/benchmarks/qml/qml.pro
+++ b/tests/benchmarks/qml/qml.pro
@@ -14,6 +14,6 @@ SUBDIRS += \
            js \
            qquickwindow
 
-contains(QT_CONFIG, opengl): SUBDIRS += painting
+qtHaveModule(opengl): SUBDIRS += painting
 
 include(../trusted-benchmarks.pri)

diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro
index 623de41..719110a 100644 (file)
--- a/tools/qmlscene/qmlscene.pro
+++ b/tools/qmlscene/qmlscene.pro
@@ -1,5 +1,5 @@
 QT += qml quick core-private
-!contains(QT_CONFIG, no-widgets):QT += widgets
+qtHaveModule(widgets): QT += widgets
 
 SOURCES += main.cpp
 

diff --git a/tools/tools.pro b/tools/tools.pro
index abb246f..c193cc9 100644 (file)
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -6,6 +6,6 @@ SUBDIRS += \
     qmlprofiler \
     qmlbundle \
     qmltestrunner
-!contains(QT_CONFIG, no-widgets):SUBDIRS += qmleasing
+qtHaveModule(widgets): SUBDIRS += qmleasing