make use of qtHaveModule()

Change-Id: I6482af592a564dbbbab28b3f425ab2886f6d1bea
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

10 files changed, 16 insertions, 16 deletions

diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
index 4079afc2..91378da9 100644
--- a/examples/declarative/declarative.pro
+++ b/examples/declarative/declarative.pro
@@ -28,7 +28,7 @@ SUBDIRS = \
     ui-components
 
 # OpenGL shader examples requires opengl and they contain some C++ and need to be built
-contains(QT_CONFIG, opengl): SUBDIRS += shadereffects
+qtHaveModule(opengl): SUBDIRS += shadereffects
 
 # These examples contain no C++ and can simply be copied
 EXAMPLE_FILES = \
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 365cb04e..c5741c2b 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -1,6 +1,6 @@
 TARGET     = QtDeclarative
 QT         = core-private gui-private widgets-private script-private
-!isEmpty(QT.xmlpatterns.name): QT_PRIVATE = xmlpatterns
+qtHaveModule(xmlpatterns): QT_PRIVATE = xmlpatterns
 else: DEFINES += QT_NO_XMLPATTERNS
 
 MODULE=declarative
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index 62fa8f16..3978b5eb 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -65,7 +65,7 @@ HEADERS += \
     $$PWD/qdeclarativelistmodelworkeragent_p.h \
     $$PWD/qlistmodelinterface_p.h
 
-contains(QT_CONFIG, xmlpatterns) {
+qtHaveModule(xmlpatterns) {
     QT+=xmlpatterns
     SOURCES += $$PWD/qdeclarativexmllistmodel.cpp
     HEADERS += $$PWD/qdeclarativexmllistmodel_p.h
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index aba013aa..2d7f4a55 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
 SUBDIRS += folderlistmodel particles gestures builtins.pro
-contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1): SUBDIRS += shaders
+qtHaveModule(opengl):!contains(QT_CONFIG, opengles1): SUBDIRS += shaders
 
-!isEmpty(QT.webkitwidgets.name): SUBDIRS += webview
+qtHaveModule(webkitwidgets): SUBDIRS += webview
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 49039871..7c4b8370 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS += qmltooling
-contains(QT_CONFIG, designer):SUBDIRS += qdeclarativeview
+qtHaveModule(designer): SUBDIRS += qdeclarativeview
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 1f442f30..27ae628d 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -75,12 +75,12 @@ contains(QT_CONFIG, private_tests) {
            qpacketprotocol
 
     # This test requires the xmlpatterns module
-    !contains(QT_CONFIG,xmlpatterns): SUBDIRS -= qdeclarativexmllistmodel
+    !qtHaveModule(xmlpatterns): SUBDIRS -= qdeclarativexmllistmodel
 }
 
-contains(QT_CONFIG, opengl): SUBDIRS += qmlshadersplugin
+qtHaveModule(opengl): SUBDIRS += qmlshadersplugin
 
-!isEmpty(QT.webkit.name): SUBDIRS += qdeclarativewebview
+qtHaveModule(webkit): SUBDIRS += qdeclarativewebview
 
 # Tests which should run in Pulse
 PULSE_TESTS = $$SUBDIRS
diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro
index 8ff6b6ef..f20c3415 100644
--- a/tests/auto/declarative/examples/examples.pro
+++ b/tests/auto/declarative/examples/examples.pro
@@ -2,8 +2,8 @@ CONFIG += testcase
 testcase.timeout = 400 # this test is slow
 TARGET = tst_examples
 
-!contains(QT_CONFIG, webkit): DEFINES += QT_NO_WEBKIT
-!contains(QT_CONFIG, xmlpatterns): DEFINES += QT_NO_XMLPATTERNS
+!qtHaveModule(webkit): DEFINES += QT_NO_WEBKIT
+!qtHaveModule(xmlpatterns): DEFINES += QT_NO_XMLPATTERNS
 
 QT += testlib
 contains(QT_CONFIG,declarative): QT += declarative
diff --git a/tests/manual/declarative/declarative.pro b/tests/manual/declarative/declarative.pro
index 337db2f9..a7a8bfb0 100644
--- a/tests/manual/declarative/declarative.pro
+++ b/tests/manual/declarative/declarative.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
-contains(QT_CONFIG, opengl): SUBDIRS += qmlshadersplugin
+qtHaveModule(opengl): SUBDIRS += qmlshadersplugin
 
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri
index c5f38808..09a2e50d 100644
--- a/tools/qml/qml.pri
+++ b/tools/qml/qml.pri
@@ -1,5 +1,5 @@
 QT += declarative declarative-private script network sql core-private gui-private widgets-private
-contains(QT_CONFIG, opengl) {
+qtHaveModule(opengl) {
     QT += opengl
     DEFINES += GL_SUPPORTED
 }
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index 669b4cea..80b1e19a 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -14,16 +14,16 @@ INSTALLS += target
 wince* {
     QT += xml
 
-    contains(QT_CONFIG, scripttools) {
+    qtHaveModule(scripttools) {
         QT += scripttools
     }
     contains(QT_CONFIG, phonon) {
         QT += phonon
     }
-    contains(QT_CONFIG, xmlpatterns) {
+    qtHaveModule(xmlpatterns) {
         QT += xmlpatterns
     }
-    contains(QT_CONFIG, webkitwidgets) {
+    qtHaveModule(webkitwidgets) {
         QT += webkitwidgets
     }
 }