diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-16 00:44:47 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-16 00:57:47 (GMT) |
| commit | 30cd548679d5e2ae026eb5e435e9bdceac6e4987 (patch) | |
| tree | 1aa00776a4ac908454eb6591033fbcf92e8363b6 /configure | |
| parent | be80bdf8bff864a21308ea58829949c84db8dbdf (diff) | |
| download | Qt-30cd548679d5e2ae026eb5e435e9bdceac6e4987.zip Qt-30cd548679d5e2ae026eb5e435e9bdceac6e4987.tar.gz Qt-30cd548679d5e2ae026eb5e435e9bdceac6e4987.tar.bz2 | |
configure; Fixes for changes to use mediaservices.
Reviewed-by: Dmytro Poplavskiy
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -5196,7 +5196,7 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then fi # Auto-detect GStreamer support (needed for both Phonon & QtMultimedia) - if [ "$CFG_PHONON" = "yes" -o "$CFG_MULTIMEDIA" = "yes" ]; then + if [ "$CFG_PHONON" = "yes" -o "$CFG_MEDIASERVICES" = "yes" ]; then if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null` @@ -6872,7 +6872,7 @@ if [ "$CFG_MEDIASERVICES" = "no" ]; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MEDIASERVICES" else QT_CONFIG="$QT_CONFIG mediaservices" - if [ "$CFG_MEDIA_BACKEND" = "yes" ]; then + if [ "$CFG_MEDIA_BACKEND" != "no" ]; then QT_CONFIG="$QT_CONFIG media-backend" fi fi |