diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-05 14:29:09 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-25 10:40:03 +0200 |
| commit | 82ade38b11071b2208ea1d18f0da27d36f877d8d (patch) | |
| tree | dfd530429b253c370428d2980dc6f4bf93c8f227 /src/plugins | |
| parent | c495dfe142d0c421ba672ee124fd4358251d232d (diff) | |
switch to new-style configure tests
Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/directshow/directshow.pro | 4 | ||||
| -rw-r--r-- | src/plugins/gstreamer/common.pri | 6 | ||||
| -rw-r--r-- | src/plugins/gstreamer/gstreamer.pro | 2 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index fe1cf5feb..02af790c2 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -12,14 +12,14 @@ DEPENDPATH += . HEADERS += dsserviceplugin.h SOURCES += dsserviceplugin.cpp -!contains(config_test_wmsdk, yes): DEFINES += QT_NO_WMSDK +!config_wmsdk: DEFINES += QT_NO_WMSDK !isEmpty(QT.widgets.name) { QT += multimediawidgets DEFINES += HAVE_WIDGETS } -contains(config_test_wmf, no): include(player/player.pri) +!config_wmf: include(player/player.pri) include(camera/camera.pri) target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} diff --git a/src/plugins/gstreamer/common.pri b/src/plugins/gstreamer/common.pri index 582b79a6c..c9a3fb661 100644 --- a/src/plugins/gstreamer/common.pri +++ b/src/plugins/gstreamer/common.pri @@ -21,17 +21,17 @@ PKGCONFIG += \ maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10 -contains(config_test_resourcepolicy, yes) { +config_resourcepolicy { DEFINES += HAVE_RESOURCE_POLICY PKGCONFIG += libresourceqt1 } -contains(config_test_xvideo, yes):!isEmpty(QT.widgets.name): { +config_xvideo:!isEmpty(QT.widgets.name): { DEFINES += HAVE_XVIDEO LIBS += -lXv -lX11 -lXext } -contains(config_test_gstreamer_appsrc, yes) { +config_gstreamer_appsrc { PKGCONFIG += gstreamer-app-0.10 DEFINES += HAVE_GST_APPSRC LIBS += -lgstapp-0.10 diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro index caa79c764..63f2c643b 100644 --- a/src/plugins/gstreamer/gstreamer.pro +++ b/src/plugins/gstreamer/gstreamer.pro @@ -7,7 +7,7 @@ SUBDIRS += \ # Camerabin2 based camera backend is untested and currently disabled disabled { - contains(config_test_gstreamer_photography, yes) { + config_gstreamer_photography { SUBDIRS += camerabin } } diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 9f94c5f86..7d24ec78c 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -13,12 +13,12 @@ win32 { } win32 { - contains(config_test_directshow, yes): SUBDIRS += directshow - contains(config_test_wmf, yes) : SUBDIRS += wmf + config_directshow: SUBDIRS += directshow + config_wmf: SUBDIRS += wmf } unix:!mac { - contains(config_test_gstreamer, yes) { + config_gstreamer { SUBDIRS += gstreamer } else { SUBDIRS += audiocapture @@ -27,7 +27,7 @@ unix:!mac { # v4l is turned off because it is not supported in Qt 5 # !maemo*:SUBDIRS += v4l - contains(config_test_pulseaudio, yes) { + config_pulseaudio { SUBDIRS += pulseaudio } } |