summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2011-07-19 15:51:43 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-25 03:13:03 +0200
commit1b1012f2990084ffc367ddb4aaf5910835bc4641 (patch)
tree95826215bceaada774084c4e2a41211a40e95bde /src/plugins
parent518ae46dfeb0bc87ea787bfe6bf0a5e183db8442 (diff)
Add the configuration tests.
Add the list of tests to sync.profile, and make sure each test only happens on the platforms it's intended for. Change-Id: Id022a6b85b349f4a8a649d3449b622e4ada7f4f4 Reviewed-on: http://codereview.qt.nokia.com/1910 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/directshow/directshow.pro2
-rw-r--r--src/plugins/gstreamer/gstreamer.pro4
-rw-r--r--src/plugins/gstreamer/mediaplayer/mediaplayer.pri2
-rw-r--r--src/plugins/plugins.pro4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index 32e5f3a31..513f810fb 100644
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -17,7 +17,7 @@ DEPENDPATH += .
HEADERS += dsserviceplugin.h
SOURCES += dsserviceplugin.cpp
-!contains(wmsdk_enabled, yes): DEFINES += QT_NO_WMSDK
+!contains(config_test_wmsdk, yes): DEFINES += QT_NO_WMSDK
include (player/player.pri)
include (camera/camera.pri)
diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro
index 9372ec2b6..1e3340b0f 100644
--- a/src/plugins/gstreamer/gstreamer.pro
+++ b/src/plugins/gstreamer/gstreamer.pro
@@ -24,7 +24,7 @@ PKGCONFIG += \
gstreamer-video-0.10
maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10
-contains(gstreamer-appsrc_enabled, yes): PKGCONFIG += gstreamer-app-0.10
+contains(config_test_gstreamer_appsrc, yes): PKGCONFIG += gstreamer-app-0.10
maemo6 {
HEADERS += camerabuttonlistener_meego.h
@@ -89,7 +89,7 @@ SOURCES += \
include(mediaplayer/mediaplayer.pri)
include(mediacapture/mediacapture.pri)
-contains(gstreamer-photography_enabled, yes) {
+contains(config_test_gstreamer_photography, yes) {
include(camerabin/camerabin.pri)
}
diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.pri b/src/plugins/gstreamer/mediaplayer/mediaplayer.pri
index 9045a80dd..310ed6f24 100644
--- a/src/plugins/gstreamer/mediaplayer/mediaplayer.pri
+++ b/src/plugins/gstreamer/mediaplayer/mediaplayer.pri
@@ -2,7 +2,7 @@ INCLUDEPATH += $$PWD
DEFINES += QMEDIA_GSTREAMER_PLAYER
-contains(gstreamer-appsrc_enabled, yes) {
+contains(config_test_gstreamer_appsrc, yes) {
HEADERS += $$PWD/qgstappsrc.h
SOURCES += $$PWD/qgstappsrc.cpp
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 5de1159be..bf747612f 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -13,7 +13,7 @@ win32 {
}
win32 {
- contains(directshow_enabled, yes): SUBDIRS += directshow
+ contains(config_test_directshow, yes): SUBDIRS += directshow
}
simulator: SUBDIRS += simulator
@@ -34,7 +34,7 @@ unix:!mac {
!maemo*:SUBDIRS += v4l
- contains(pulseaudio_enabled, yes) {
+ contains(config_test_pulseaudio, yes) {
SUBDIRS += pulseaudio
}
}