Adjust decarative after qtConfig changes in qtbase

Most of the changes are optional, but cleanup our QT_CONFIG
usage.

Change-Id: I5253d53f72f6fb03c2cfedae1e17d94f424a6bbb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

8 files changed, 13 insertions, 17 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index b72a43d742..7b13cb2b6d 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -8,7 +8,7 @@ SUBDIRS=\
     installed_cmake \
     toolsupport
 
-qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) {
+qtHaveModule(gui):qtConfig(opengl(es1|es2)?) {
     SUBDIRS += particles
     qtHaveModule(widgets): SUBDIRS += quickwidgets
 
diff --git a/tests/auto/particles/particles.pro b/tests/auto/particles/particles.pro
index 265a1eabc7..6ee1290dbb 100644
--- a/tests/auto/particles/particles.pro
+++ b/tests/auto/particles/particles.pro
@@ -25,6 +25,5 @@ PRIVATETESTS += \
     qquickturbulence \
     qquickwander
 
-contains(QT_CONFIG, private_tests) {
+qtConfig(private_tests): \
     SUBDIRS += $$PRIVATETESTS
-}
diff --git a/tests/auto/qml/debugger/debugger.pro b/tests/auto/qml/debugger/debugger.pro
index ccb2d71c53..a50411e18b 100644
--- a/tests/auto/qml/debugger/debugger.pro
+++ b/tests/auto/qml/debugger/debugger.pro
@@ -20,6 +20,6 @@ PRIVATETESTS += \
 
 SUBDIRS += $$PUBLICTESTS
 
-contains(QT_CONFIG, private_tests) {
+qtConfig(private_tests): \
     SUBDIRS += $$PRIVATETESTS
-}
+
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index a1daa7a0c4..fae1b6f58b 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -79,9 +79,8 @@ SUBDIRS += $$METATYPETESTS
     SUBDIRS += qmllint
 }
 
-contains(QT_CONFIG, private_tests) {
+qtConfig(private_tests): \
     SUBDIRS += $$PRIVATETESTS
-}
 
 qtNomakeTools( \
     qmlplugindump \
diff --git a/tests/auto/qmldevtools/compile/compile.pro b/tests/auto/qmldevtools/compile/compile.pro
index 54430eb668..832700698f 100644
--- a/tests/auto/qmldevtools/compile/compile.pro
+++ b/tests/auto/qmldevtools/compile/compile.pro
@@ -5,7 +5,7 @@ force_bootstrap {
     !build_pass: CONFIG += release
 } else {
     QT = core
-    !build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release
+    !build_pass:qtConfig(debug_and_release): CONFIG += release
 }
 QT += qmldevtools-private
 macx:CONFIG -= app_bundle
diff --git a/tests/auto/qmldevtools/qmldevtools.pro b/tests/auto/qmldevtools/qmldevtools.pro
index a0ca1bff87..a9352d4df3 100644
--- a/tests/auto/qmldevtools/qmldevtools.pro
+++ b/tests/auto/qmldevtools/qmldevtools.pro
@@ -1,6 +1,4 @@
 TEMPLATE = subdirs
 
-contains(QT_CONFIG, private_tests) {
-    SUBDIRS += \
-        compile
-}
+qtConfig(private_tests): \
+    SUBDIRS += compile
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 70e5b8ef6a..c7ba4de86c 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -4,7 +4,7 @@ PUBLICTESTS += \
     geometry \
     qquickpixmapcache
 
-contains(QT_CONFIG, opengl(es1|es2)?) {
+qtConfig(opengl(es1|es2)?) {
     PUBLICTESTS += \
         rendernode
     qtHaveModule(widgets): PUBLICTESTS += nodes
@@ -88,9 +88,9 @@ QUICKTESTS =  \
 
 SUBDIRS += $$PUBLICTESTS
 
-!contains(QT_CONFIG, accessibility):QUICKTESTS -= qquickaccessible
+!qtConfig(accessibility):QUICKTESTS -= qquickaccessible
 
-contains(QT_CONFIG, private_tests) {
+qtConfig(private_tests) {
     SUBDIRS += $$PRIVATETESTS
     SUBDIRS += $$QUICKTESTS
 }
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index bd071ecf5c..5e6bc65815 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 SUBDIRS = qml script
-contains(QT_CONFIG, private_tests) {
-    contains(QT_CONFIG, opengl(es1|es2)?):SUBDIRS += particles
+qtConfig(private_tests) {
+    qtConfig(opengl(es1|es2)?):SUBDIRS += particles
 }