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>
This commit is contained in:
Oswald Buddenhagen
2012-12-21 11:45:50 +01:00
committed by The Qt Project
parent 07efce4375
commit 4760e1fb02
16 changed files with 22 additions and 24 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -37,7 +37,7 @@ OBJECTIVE_SOURCES += \
avfvideoframerenderer.mm \
avfvideooutput.mm
!isEmpty(QT.widgets.name) {
qtHaveModule(widgets) {
QT += multimediawidgets-private opengl
HEADERS += \
avfvideowidgetcontrol.h \

View File

@@ -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
}

View File

@@ -11,7 +11,7 @@ SOURCES += dsserviceplugin.cpp
!config_wmsdk: DEFINES += QT_NO_WMSDK
!isEmpty(QT.widgets.name) {
qtHaveModule(widgets) {
QT += multimediawidgets
DEFINES += HAVE_WIDGETS
}

View File

@@ -35,7 +35,7 @@ SOURCES += \
$$PWD/mediasamplevideobuffer.cpp \
$$PWD/videosurfacefilter.cpp
!isEmpty(QT.widgets.name):!simulator {
qtHaveModule(widgets):!simulator {
HEADERS += \
$$PWD/vmr9videowindowcontrol.h

View File

@@ -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
}

View File

@@ -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

View File

@@ -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
}

View File

@@ -1,6 +1,6 @@
TARGET = wmfengine
QT += multimedia-private network
!isEmpty(QT.widgets.name) {
qtHaveModule(widgets) {
QT += multimediawidgets-private
DEFINES += HAVE_WIDGETS
}

View File

@@ -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)