summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2012-01-09 16:59:54 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-11 01:00:42 +0100
commitf7bfcdfa288b4d85adc5649fd7e4f97d42357e7f (patch)
treec07765ddbdb6635db4ff9d35f3109238ad3b565e /src
parent23470c20355c8e7911be5a10355852c4cb921f76 (diff)
Remove widgets config test.
Since it's not guaranteed that other Qt modules will be built by the time qmake is run (and config.tests are created) we can't rely on compilation. Just check the module.pri variable for widgets instead. Change-Id: I352cf6427b748b89b69ec17588ce0dd83065090f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src')
-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/gstreamer.pro6
-rw-r--r--src/plugins/plugins.pro2
-rw-r--r--src/plugins/qt7/qt7.pro6
-rw-r--r--src/plugins/wmf/player/player.pri2
-rw-r--r--src/plugins/wmf/wmf.pro2
-rw-r--r--src/src.pro2
9 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri
index 3067497b..9acd5e54 100644
--- a/src/plugins/directshow/camera/camera.pri
+++ b/src/plugins/directshow/camera/camera.pri
@@ -24,7 +24,7 @@ SOURCES += \
$$PWD/dsimagecapturecontrol.cpp \
$$PWD/dscamerasession.cpp
-contains(config_test_widgets, yes) {
+!isEmpty(QT.widgets.name) {
HEADERS += $$PWD/dsvideowidgetcontrol.h
SOURCES += $$PWD/dsvideowidgetcontrol.cpp
}
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index e027a2c7..bb5bb023 100644
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -14,7 +14,7 @@ SOURCES += dsserviceplugin.cpp
!contains(config_test_wmsdk, yes): DEFINES += QT_NO_WMSDK
-contains(config_test_widgets, yes) {
+!isEmpty(QT.widgets.name) {
QT += multimediawidgets
DEFINES += HAVE_WIDGETS
}
diff --git a/src/plugins/directshow/player/player.pri b/src/plugins/directshow/player/player.pri
index c30b2836..3a3048ac 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
-contains(config_test_widgets, yes):!simulator {
+!isEmpty(QT.widgets.name):!simulator {
HEADERS += \
$$PWD/vmr9videowindowcontrol.h
diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro
index 137b61c5..6f4d43b9 100644
--- a/src/plugins/gstreamer/gstreamer.pro
+++ b/src/plugins/gstreamer/gstreamer.pro
@@ -5,7 +5,7 @@ TARGET = qgstengine
QT += multimedia-private network
CONFIG += no_private_qt_headers_warning
-contains(config_test_widgets, yes) {
+!isEmpty(QT.widgets.name) {
QT += widgets multimediawidgets-private
DEFINES += HAVE_WIDGETS
}
@@ -46,7 +46,7 @@ maemo6 {
PKGCONFIG += qmsystem2
- isEqual(QT_ARCH,armv6):contains(config_test_widgets, yes) {
+ isEqual(QT_ARCH,armv6):!isEmpty(QT.widgets.name) {
HEADERS += qgstreamergltexturerenderer.h
SOURCES += qgstreamergltexturerenderer.cpp
QT += opengl
@@ -74,7 +74,7 @@ SOURCES += \
gstvideoconnector.c \
-contains(config_test_xvideo, yes):contains(config_test_widgets, yes): {
+contains(config_test_xvideo, yes):!isEmpty(QT.widgets.name): {
DEFINES += HAVE_XVIDEO
LIBS += -lXv -lX11 -lXext
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 0317d7d1..ac5968a3 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -39,6 +39,6 @@ mac:!simulator {
# Currently we need qmacdefines_mac.h from QtWidgets, so this depends on that :/
# despite the code not really using them.
- contains(config_test_widgets, yes):SUBDIRS += qt7
+ !isEmpty(QT.widgets.name):SUBDIRS += qt7
}
diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro
index 32f6d218..c17205c4 100644
--- a/src/plugins/qt7/qt7.pro
+++ b/src/plugins/qt7/qt7.pro
@@ -2,7 +2,7 @@ load(qt_module)
TARGET = qqt7engine
QT += multimedia-private network
-contains(config_test_widgets, yes) {
+!isEmpty(QT.widgets.name) {
QT += multimediawidgets-private widgets
}
@@ -56,9 +56,9 @@ OBJECTIVE_SOURCES += \
qt7ciimagevideobuffer.mm \
qcvdisplaylink.mm
- contains(config_test_widgets, yes) {
+ !isEmpty(QT.widgets.name) {
HEADERS += \
- qt7movieviewwidget.h
+ qt7movievideowidget.h
OBJECTIVE_SOURCES += \
qt7movievideowidget.mm
diff --git a/src/plugins/wmf/player/player.pri b/src/plugins/wmf/player/player.pri
index 07142130..57cca77e 100644
--- a/src/plugins/wmf/player/player.pri
+++ b/src/plugins/wmf/player/player.pri
@@ -24,7 +24,7 @@ SOURCES += \
$$PWD/mfaudioendpointcontrol.cpp \
$$PWD/mfmetadatacontrol.cpp
-contains(config_test_widgets, yes):!simulator {
+!isEmpty(QT.widgets.name):!simulator {
HEADERS += $$PWD/evr9videowindowcontrol.h
SOURCES += $$PWD/evr9videowindowcontrol.cpp
}
diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro
index 7c2e0abe..38c08880 100644
--- a/src/plugins/wmf/wmf.pro
+++ b/src/plugins/wmf/wmf.pro
@@ -2,7 +2,7 @@ load(qt_module)
TARGET = wmfengine
QT += multimedia-private network
-contains(config_test_widgets, yes) {
+!isEmpty(QT.widgets.name) {
QT += multimediawidgets-private
DEFINES += HAVE_WIDGETS
}
diff --git a/src/src.pro b/src/src.pro
index 14b6c707..aea0f58e 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -19,7 +19,7 @@ SUBDIRS += src_imports
# Optional bits
contains(config_test_gstreamer, yes):SUBDIRS += src_qgsttools
-contains(config_test_widgets, yes) {
+!isEmpty(QT.widgets.name) {
SUBDIRS += src_qtmmwidgets
# If widgets is around, plugins depends on widgets too (imports does not)