diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-16 00:44:47 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-16 03:38:43 (GMT) |
| commit | dd9a3a5e7165d285fa96b4bf6b21bc3515d719ff (patch) | |
| tree | 37639897711f9ffe2a3da2cfa2fe8268f972f322 | |
| parent | 4a2158280ac3a2eec074f7f1ba8aa82e0dcadd90 (diff) | |
| download | Qt-dd9a3a5e7165d285fa96b4bf6b21bc3515d719ff.zip Qt-dd9a3a5e7165d285fa96b4bf6b21bc3515d719ff.tar.gz Qt-dd9a3a5e7165d285fa96b4bf6b21bc3515d719ff.tar.bz2 | |
configure; Fixes for changes to use mediaservices.
Reviewed-by: Dmytro Poplavskiy
(cherry picked from commit 30cd548679d5e2ae026eb5e435e9bdceac6e4987)
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -5201,7 +5201,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` @@ -6838,7 +6838,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 |