Adjust to qtConfig() changes in qtbase

Change-Id: I26d80ece18abf882338de5ce0258469ed103a0eb
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

8 files changed, 12 insertions, 17 deletions

diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro
index a5c1d9493..216189d9a 100644
--- a/src/gsttools/gsttools.pro
+++ b/src/gsttools/gsttools.pro
@@ -95,7 +95,7 @@ equals(GST_VERSION,"0.10") {
     maemo6 {
         PKGCONFIG_PRIVATE += qmsystem2
 
-        contains(QT_CONFIG, opengles2):qtHaveModule(widgets) {
+        qtConfig(opengles2):qtHaveModule(widgets) {
             PRIVATE_HEADERS += qgstreamergltexturerenderer_p.h
             SOURCES += qgstreamergltexturerenderer.cpp
             QT += opengl
@@ -113,7 +113,7 @@ equals(GST_VERSION,"0.10") {
 }
 
 mir: {
-    contains(QT_CONFIG, opengles2):qtHaveModule(widgets) {
+    qtConfig(opengles2):qtHaveModule(widgets) {
         PRIVATE_HEADERS += qgstreamermirtexturerenderer_p.h
         SOURCES += qgstreamermirtexturerenderer.cpp
         QT += opengl quick
diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index 60321fba8..29ec710f5 100644
--- a/src/multimediawidgets/multimediawidgets.pro
+++ b/src/multimediawidgets/multimediawidgets.pro
@@ -1,11 +1,8 @@
 # distinct from Qt Multimedia
 TARGET = QtMultimediaWidgets
 QT = core gui multimedia-private widgets-private
-qtHaveModule(opengl):!contains(QT_CONFIG, opengles1) {
+qtHaveModule(opengl): \
    QT_PRIVATE += opengl
-} else {
-   DEFINES += QT_NO_OPENGL
-}
 
 PRIVATE_HEADERS += \
     qvideowidget_p.h \
@@ -25,7 +22,7 @@ SOURCES += \
     qvideowidget.cpp
 
 maemo6 {
-    contains(QT_CONFIG, opengles2) {
+    qtConfig(opengles2) {
         PRIVATE_HEADERS += qeglimagetexturesurface_p.h
         SOURCES += qeglimagetexturesurface.cpp
 
diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
index 779d5ff2d..29e231066 100644
--- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
+++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
@@ -40,7 +40,7 @@ OBJECTIVE_SOURCES += \
     }
 
 ios|tvos {
-    contains(QT_CONFIG, opengl.*) {
+    qtConfig(opengl) {
         HEADERS += \
             avfvideoframerenderer_ios.h \
             avfvideorenderercontrol.h \
@@ -55,7 +55,7 @@ ios|tvos {
 } else {
     LIBS += -framework AppKit
 
-    contains(QT_CONFIG, opengl.*) {
+    qtConfig(opengl) {
         HEADERS += \
             avfvideoframerenderer.h \
             avfvideorenderercontrol.h \
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index 5cdf9d1b6..10c6fe2b6 100644
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -1,5 +1,5 @@
 TARGET = dsengine
-win32:!qtHaveModule(opengl)|contains(QT_CONFIG,dynamicgl) {
+win32:!qtHaveModule(opengl)|qtConfig(dynamicgl) {
     LIBS_PRIVATE += -lgdi32 -luser32
 }
 
diff --git a/src/plugins/videonode/videonode.pro b/src/plugins/videonode/videonode.pro
index e38b0a6a0..b7b18cdcf 100644
--- a/src/plugins/videonode/videonode.pro
+++ b/src/plugins/videonode/videonode.pro
@@ -4,4 +4,4 @@ config_gpu_vivante {
     SUBDIRS += imx6
 }
 
-contains(QT_CONFIG, egl):contains(QT_CONFIG, opengles2):!android: SUBDIRS += egl
+qtConfig(egl):qtConfig(opengles2):!android: SUBDIRS += egl
diff --git a/src/src.pro b/src/src.pro
index b0566023d..17f3266c5 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -13,7 +13,7 @@ src_plugins.subdir = plugins
 src_plugins.depends = multimedia
 
 
-qtHaveModule(quick):contains(QT_CONFIG, opengl) {
+qtHaveModule(quick):qtConfig(opengl) {
     src_qtmultimediaquicktools.subdir = qtmultimediaquicktools
     src_qtmultimediaquicktools.depends = multimedia
 
diff --git a/tests/auto/unit/multimediawidgets.pro b/tests/auto/unit/multimediawidgets.pro
index 31f8e546c..1bcfc6c2e 100644
--- a/tests/auto/unit/multimediawidgets.pro
+++ b/tests/auto/unit/multimediawidgets.pro
@@ -7,7 +7,7 @@ SUBDIRS += \
 
 # Tests depending on private interfaces should only be built if
 # these interfaces are exported.
-contains (QT_CONFIG, private_tests) {
+qtConfig(private_tests) {
   SUBDIRS += \
     qgraphicsvideoitem \
     qpaintervideosurface \
diff --git a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
index 848b1c806..f1db2c5fb 100644
--- a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
+++ b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
@@ -2,11 +2,9 @@ CONFIG += testcase
 TARGET = tst_qpaintervideosurface
 
 QT += multimedia-private multimediawidgets-private testlib
-qtHaveModule(opengl) {
+qtHaveModule(opengl): \
    QT += opengl
-} else {
-   DEFINES += QT_NO_OPENGL
-}
+
 
 SOURCES += tst_qpaintervideosurface.cpp