make use of qtHaveModule()

Change-Id: I14da5455b7dd4681254e1652395df5f5c65746bd
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

diff --git a/examples/multimedia/multimedia.pro b/examples/multimedia/multimedia.pro
index 85dc4cd..bacbba9 100644 (file)
--- a/examples/multimedia/multimedia.pro
+++ b/examples/multimedia/multimedia.pro
@@ -3,7 +3,7 @@ TEMPLATE = subdirs
 SUBDIRS += audiodecoder
 
 # These examples all need widgets for now (using creator templates that use widgets)
-!isEmpty(QT.widgets.name) {
+qtHaveModule(widgets) {
     SUBDIRS += \
         radio \
         spectrum \
@@ -13,7 +13,7 @@ SUBDIRS += audiodecoder
         audiooutput \
 }
 
-!isEmpty(QT.gui.name):!isEmpty(QT.qml.name) {
+qtHaveModule(gui):qtHaveModule(qml) {
     SUBDIRS += \
         declarative-radio \
         video

diff --git a/examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro b/examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro
index 387e494..2fb123e 100644 (file)
--- a/examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro
+++ b/examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro
@@ -3,7 +3,7 @@ TARGET = customvideoitem
 
 QT += multimedia multimediawidgets widgets
 
-contains(QT_CONFIG, opengl): QT += opengl
+qtHaveModule(opengl): QT += opengl
 
 HEADERS   += videoplayer.h \
              videoitem.h

diff --git a/examples/multimediawidgets/multimediawidgets.pro b/examples/multimediawidgets/multimediawidgets.pro
index b14ddd2..d8990cd 100644 (file)
--- a/examples/multimediawidgets/multimediawidgets.pro
+++ b/examples/multimediawidgets/multimediawidgets.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 
 # These examples all need widgets for now (using creator templates that use widgets)
-!isEmpty(QT.widgets.name) {
+qtHaveModule(widgets) {
     SUBDIRS += \
         camera \
         videographicsitem \
@@ -10,7 +10,7 @@ TEMPLATE = subdirs
         customvideosurface
 }
 
-!isEmpty(QT.gui.name):!isEmpty(QT.qml.name) {
+qtHaveModule(gui):qtHaveModule(qml) {
     disabled:SUBDIRS += declarative-camera
 }
 

diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro
index eb1041c..9d1f7c8 100644 (file)
--- a/src/gsttools/gsttools.pro
+++ b/src/gsttools/gsttools.pro
@@ -77,7 +77,7 @@ config_xvideo {
     SOURCES += \
         qgstxvimagebuffer.cpp \
 
-    !isEmpty(QT.widgets.name) {
+    qtHaveModule(widgets) {
         QT += multimediawidgets
 
         PRIVATE_HEADERS += \
@@ -97,7 +97,7 @@ config_xvideo {
 maemo6 {
     PKGCONFIG += qmsystem2
 
-    contains(QT_CONFIG, opengles2):!isEmpty(QT.widgets.name) {
+    contains(QT_CONFIG, opengles2):qtHaveModule(widgets) {
         PRIVATE_HEADERS += qgstreamergltexturerenderer_p.h
         SOURCES += qgstreamergltexturerenderer.cpp
         QT += opengl

diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index d0638dd..65a18f7 100644 (file)
--- a/src/multimediawidgets/multimediawidgets.pro
+++ b/src/multimediawidgets/multimediawidgets.pro
@@ -1,7 +1,7 @@
 # distinct from QtMultimedia
 TARGET = QtMultimediaWidgets
 QT = core gui multimedia-private widgets-private
-contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
+qtHaveModule(opengl):!contains(QT_CONFIG, opengles1) {
    QT_PRIVATE += opengl
 } else {
    DEFINES += QT_NO_OPENGL

diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
index d1957d5..a61c62d 100644 (file)
--- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
+++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
@@ -37,7 +37,7 @@ OBJECTIVE_SOURCES += \
     avfvideoframerenderer.mm \
     avfvideooutput.mm
 
-!isEmpty(QT.widgets.name) {
+qtHaveModule(widgets) {
     QT += multimediawidgets-private opengl
     HEADERS += \
         avfvideowidgetcontrol.h \

diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri
index 91111be..7081abd 100644 (file)
--- a/src/plugins/directshow/camera/camera.pri
+++ b/src/plugins/directshow/camera/camera.pri
@@ -23,7 +23,7 @@ SOURCES += \
     $$PWD/dsimagecapturecontrol.cpp \
     $$PWD/dscamerasession.cpp
 
-!isEmpty(QT.widgets.name) {
+qtHaveModule(widgets) {
     HEADERS += $$PWD/dsvideowidgetcontrol.h
     SOURCES += $$PWD/dsvideowidgetcontrol.cpp
 }

diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index 4967698..95f78ed 100644 (file)
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -11,7 +11,7 @@ SOURCES += dsserviceplugin.cpp
 
 !config_wmsdk: DEFINES += QT_NO_WMSDK
 
-!isEmpty(QT.widgets.name) {
+qtHaveModule(widgets) {
     QT += multimediawidgets
     DEFINES += HAVE_WIDGETS
 }

diff --git a/src/plugins/directshow/player/player.pri b/src/plugins/directshow/player/player.pri
index 3a3048a..e9675c2 100644 (file)
--- a/src/plugins/directshow/player/player.pri
+++ b/src/plugins/directshow/player/player.pri
@@ -35,7 +35,7 @@ SOURCES += \
         $$PWD/mediasamplevideobuffer.cpp \
         $$PWD/videosurfacefilter.cpp
 
-!isEmpty(QT.widgets.name):!simulator {
+qtHaveModule(widgets):!simulator {
     HEADERS += \
         $$PWD/vmr9videowindowcontrol.h
 

diff --git a/src/plugins/gstreamer/common.pri b/src/plugins/gstreamer/common.pri
index c9a3fb6..9108657 100644 (file)
--- a/src/plugins/gstreamer/common.pri
+++ b/src/plugins/gstreamer/common.pri
@@ -2,7 +2,7 @@
 QT += multimedia-private network
 CONFIG += no_private_qt_headers_warning
 
-!isEmpty(QT.widgets.name) {
+qtHaveModule(widgets) {
     QT += widgets multimediawidgets-private
     DEFINES += HAVE_WIDGETS
 }
@@ -26,7 +26,7 @@ config_resourcepolicy {
     PKGCONFIG += libresourceqt1
 }
 
-config_xvideo:!isEmpty(QT.widgets.name): {
+config_xvideo:qtHaveModule(widgets) {
     DEFINES += HAVE_XVIDEO
     LIBS += -lXv -lX11 -lXext
 }

diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro
index f5d8bae..b23eba4 100644 (file)
--- a/src/plugins/qt7/qt7.pro
+++ b/src/plugins/qt7/qt7.pro
@@ -3,7 +3,7 @@ CONFIG += no_keywords
 
 TARGET = qqt7engine
 QT += multimedia-private network
-!isEmpty(QT.widgets.name) {
+qtHaveModule(widgets) {
     QT += multimediawidgets-private widgets
 }
 
@@ -50,7 +50,7 @@ OBJECTIVE_SOURCES += \
         qt7ciimagevideobuffer.mm \
         qcvdisplaylink.mm
 
-    !isEmpty(QT.widgets.name) {
+    qtHaveModule(widgets) {
         HEADERS += \
             qt7movieviewrenderer.h \
             qt7movievideowidget.h

diff --git a/src/plugins/wmf/player/player.pri b/src/plugins/wmf/player/player.pri
index ac8dc9f..a72708b 100644 (file)
--- a/src/plugins/wmf/player/player.pri
+++ b/src/plugins/wmf/player/player.pri
@@ -24,7 +24,7 @@ SOURCES += \
     $$PWD/mfaudioprobecontrol.cpp \
     $$PWD/mfvideoprobecontrol.cpp
 
-!isEmpty(QT.widgets.name):!simulator {
+qtHaveModule(widgets):!simulator {
     HEADERS += $$PWD/evr9videowindowcontrol.h
     SOURCES += $$PWD/evr9videowindowcontrol.cpp
 }

diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro
index fcd2a32..34bd2c3 100644 (file)
--- a/src/plugins/wmf/wmf.pro
+++ b/src/plugins/wmf/wmf.pro
@@ -1,6 +1,6 @@
 TARGET = wmfengine
 QT += multimedia-private network
-!isEmpty(QT.widgets.name) {
+qtHaveModule(widgets) {
     QT += multimediawidgets-private
     DEFINES += HAVE_WIDGETS
 }

diff --git a/src/src.pro b/src/src.pro
index 7112295..26f99bc 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -13,7 +13,7 @@ src_plugins.subdir = plugins
 src_plugins.depends = multimedia
 
 
-!isEmpty(QT.quick.name) {
+qtHaveModule(quick) {
     src_qtmultimediaquicktools.subdir = qtmultimediaquicktools
     src_qtmultimediaquicktools.depends = multimedia
 
@@ -26,7 +26,7 @@ src_plugins.depends = multimedia
 }
 
 # Optional bits
-!isEmpty(QT.widgets.name) {
+qtHaveModule(widgets) {
     SUBDIRS += src_qtmmwidgets
 
     # If widgets is around, plugins depends on widgets too (imports does not)

diff --git a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
index 4408c4f..4f51202 100644 (file)
--- a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
+++ b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
@@ -2,14 +2,12 @@ CONFIG += testcase
 TARGET = tst_qpaintervideosurface
 
 QT += multimedia-private multimediawidgets-private testlib
-contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
+qtHaveModule(opengl) {
    QT += opengl
 } else {
    DEFINES += QT_NO_OPENGL
 }
 
-contains(QT_CONFIG, opengl): QT += opengl
-
 SOURCES += tst_qpaintervideosurface.cpp
 
 QT+=widgets

diff --git a/tests/auto/unit/unit.pro b/tests/auto/unit/unit.pro
index a79f7fa..96dbf01 100644 (file)
--- a/tests/auto/unit/unit.pro
+++ b/tests/auto/unit/unit.pro
@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
 
 SUBDIRS += multimedia.pro
-!isEmpty(QT.widgets.name): SUBDIRS += multimediawidgets.pro
+qtHaveModule(widgets): SUBDIRS += multimediawidgets.pro