make use of qtHaveModule()

Change-Id: I23f11c944fafb5863a960dcc83bc1e57e189f662
Reviewed-by: Sergio Ahumada <[email protected]>
Reviewed-by: Tasuku Suzuki <[email protected]>
Reviewed-by: Joerg Bornemann <[email protected]>

8 files changed, 10 insertions, 10 deletions

diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index bbef36167e..b77effe3e5 100644
--- 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 4aff6cf902..bc55ed9376 100644
--- 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 bd9cc258c2..fb02caebdc 100644
--- 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 b6c09479a2..48fd7e8e9a 100644
--- 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 d03cfaa8b4..60ae065910 100644
--- 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 5f18fc94bf..9600d0c7cf 100644
--- 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 3f05185cbe..bde891e12d 100644
--- 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 3fbf130969..c50f57b655 100644
--- 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)