summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-12-21 11:45:50 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-11 15:15:05 +0100
commit4760e1fb02aac87e4186fb1bedf0ba4a3845d7be (patch)
tree1c739ae11bfc573a79f8e37fded759f04c963a13 /src
parent07efce437529c1d7e0d7dd15d201949b091b7b2a (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/gsttools/gsttools.pro4
-rw-r--r--src/multimediawidgets/multimediawidgets.pro2
-rw-r--r--src/plugins/avfoundation/mediaplayer/mediaplayer.pro2
-rw-r--r--src/plugins/directshow/camera/camera.pri2
-rw-r--r--src/plugins/directshow/directshow.pro2
-rw-r--r--src/plugins/directshow/player/player.pri2
-rw-r--r--src/plugins/gstreamer/common.pri4
-rw-r--r--src/plugins/qt7/qt7.pro4
-rw-r--r--src/plugins/wmf/player/player.pri2
-rw-r--r--src/plugins/wmf/wmf.pro2
-rw-r--r--src/src.pro4
11 files changed, 15 insertions, 15 deletions
diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro
index eb1041ca..9d1f7c8f 100644
--- 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 d0638dd2..65a18f77 100644
--- 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 d1957d5f..a61c62d0 100644
--- 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 91111bee..7081abd3 100644
--- 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 49676989..95f78ed8 100644
--- 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 3a3048ac..e9675c2c 100644
--- 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 c9a3fb66..91086576 100644
--- 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 f5d8bae3..b23eba40 100644
--- 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 ac8dc9f0..a72708b3 100644
--- 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 fcd2a326..34bd2c3a 100644
--- 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 71122954..26f99bc2 100644
--- 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)