diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/multimediakit/audio/audio.pri | 2 | ||||
-rw-r--r-- | src/multimediakit/effects/effects.pri | 2 | ||||
-rw-r--r-- | src/plugins/directshow/directshow.pro | 2 | ||||
-rw-r--r-- | src/plugins/gstreamer/gstreamer.pro | 4 | ||||
-rw-r--r-- | src/plugins/gstreamer/mediaplayer/mediaplayer.pri | 2 | ||||
-rw-r--r-- | src/plugins/plugins.pro | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/multimediakit/audio/audio.pri b/src/multimediakit/audio/audio.pri index 799d6a05b..4bedbd4d5 100644 --- a/src/multimediakit/audio/audio.pri +++ b/src/multimediakit/audio/audio.pri @@ -44,7 +44,7 @@ win32 { } unix:!mac { - contains(pulseaudio_enabled, yes) { + contains(config_test_pulseaudio, yes) { DEFINES += QT_NO_AUDIO_BACKEND } else:contains(QT_CONFIG, alsa) { diff --git a/src/multimediakit/effects/effects.pri b/src/multimediakit/effects/effects.pri index 20eb692e6..2b003a072 100644 --- a/src/multimediakit/effects/effects.pri +++ b/src/multimediakit/effects/effects.pri @@ -1,7 +1,7 @@ INCLUDEPATH += effects unix:!mac { - contains(pulseaudio_enabled, yes) { + contains(config_test_pulseaudio, yes) { CONFIG += link_pkgconfig PKGCONFIG += libpulse 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 } } |