Merge remote branch 'qt/4.7' into lighthouse-4.7

Conflicts:
	src/gui/egl/egl.pri
	src/gui/painting/qwindowsurface_p.h

1 files changed, 45 insertions, 27 deletions

diff --git a/configure b/configure
index 600222b..69df540 100755
--- a/configure
+++ b/configure
@@ -712,7 +712,8 @@ CFG_RELEASE_QMAKE=no
 CFG_PHONON=auto
 CFG_PHONON_BACKEND=yes
 CFG_MULTIMEDIA=auto
-CFG_MEDIASERVICE=auto
+CFG_MEDIASERVICES=auto
+CFG_MEDIA_BACKEND=auto
 CFG_AUDIO_BACKEND=auto
 CFG_SVG=auto
 CFG_DECLARATIVE=auto
@@ -967,7 +968,7 @@ while [ "$#" -gt 0 ]; do
         VAL=no
         ;;
     #Qt style yes options
-        -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-mediaservice|-audio-backend|-svg|-declarative|-webkit|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles)
+        -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-mediaservices|-media-backend|-audio-backend|-svg|-declarative|-webkit|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles)
         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
         VAL=yes
         ;;
@@ -2221,9 +2222,16 @@ while [ "$#" -gt 0 ]; do
             UNKNOWN_OPT=yes
         fi
         ;;
-    mediaservice)
+    mediaservices)
         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
-            CFG_MEDIASERVICE="$VAL"
+            CFG_MEDIASERVICES="$VAL"
+        else
+            UNKNOWN_OPT=yes
+        fi
+        ;;
+    media-backend)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_MEDIA_BACKEND="$VAL"
         else
             UNKNOWN_OPT=yes
         fi
@@ -3464,8 +3472,9 @@ Usage:  $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir
         [-no-separate-debug-info] [-no-mmx] [-no-3dnow] [-no-sse] [-no-sse2]
         [-qtnamespace <namespace>] [-qtlibinfix <infix>] [-separate-debug-info] [-armfpa]
         [-no-optimized-qmake] [-optimized-qmake] [-no-xmlpatterns] [-xmlpatterns]
-        [-no-multimedia] [-multimedia] [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend]
-        [-no-mediaservice] [-mediaservice] [-no-audio-backend] [-audio-backend] 
+        [-no-multimedia] [-multimedia] [-no-mediaservices] [-mediaservices]
+        [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend]
+        [-no-media-backend] [-media-backend] [-no-audio-backend] [-audio-backend] 
         [-no-openssl] [-openssl] [-openssl-linked]
         [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] [-no-javascript-jit] [-javascript-jit]
         [-no-script] [-script] [-no-scripttools] [-scripttools] [-no-declarative] [-declarative]
@@ -3606,12 +3615,15 @@ fi
     -no-multimedia ..... Do not build the QtMultimedia module.
  +  -multimedia ........ Build the QtMultimedia module.
 
-    -no-mediaservice.... Do not build platform mediaservice plugin.
- +  -mediaservice ...... Build the platform mediaservice plugin.
-
     -no-audio-backend .. Do not build the platform audio backend into QtMultimedia.
  +  -audio-backend ..... Build the platform audio backend into QtMultimedia if available.
 
+    -no-mediaservices... Do not build the QtMediaServices module.
+ +  -mediaservices...... Build the QtMediaServices module.
+
+    -no-media-backend... Do not build platform mediaservices plugin.
+ +  -media-backend..... Build the platform mediaservices plugin.
+
     -no-phonon ......... Do not build the Phonon module.
  +  -phonon ............ Build the Phonon module.
                          Phonon is built if a decent C++ compiler is used.
@@ -4475,8 +4487,7 @@ fi
 # is where the resulting variable is written to
 setBootstrapVariable()
 {
-    variableRegExp="^$1[^_A-Z0-9]"
-    getQMakeConf | grep "$variableRegExp" | ( [ -n "$2" ] && sed "$2" ; [ -z "$2" ] && cat ) | $AWK '
+    getQMakeConf | $AWK '/^('"$1"')[^_A-Z0-9]/ { print $0; }' | ( [ -n "$2" ] && sed "$2" ; [ -z "$2" ] && cat ) | $AWK '
 {
     varLength = index($0, "=") - 1
     valStart = varLength + 2
@@ -4591,10 +4602,10 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)"
         fi
 
-	if [ '!' -z "$RPATH_FLAGS" ] && [ '!' -z "`getQMakeConf \"$QMAKESPEC\" | grep QMAKE_RPATH | awk '{print $3;}'`" ]; then
-  	    setBootstrapVariable QMAKE_RPATH 's,\$\$LITERAL_WHITESPACE, ,'
-	    for rpath in $RPATH_FLAGS; do
-		EXTRA_LFLAGS="\$(QMAKE_RPATH)\"$rpath\" $EXTRA_LFLAGS"
+        if [ '!' -z "$RPATH_FLAGS" ] && [ '!' -z "`getQMakeConf \"$QMAKESPEC\" | $AWK '/QMAKE_(LFLAGS_)?RPATH/ {print $3;}'`" ]; then
+            setBootstrapVariable "QMAKE_(LFLAGS_)?RPATH" 's,\$\$LITERAL_WHITESPACE, ,;s,QMAKE_RPATH,QMAKE_LFLAGS_RPATH,'
+            for rpath in $RPATH_FLAGS; do
+                EXTRA_LFLAGS="\$(QMAKE_LFLAGS_RPATH)\"$rpath\" $EXTRA_LFLAGS"
             done
         fi
         if [ "$BUILD_ON_MAC" = "yes" ]; then
@@ -5238,20 +5249,20 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_EMBLITE" =
     fi
 
     if [ "$CFG_GUI" = "no" ]; then
-        if [ "$CFG_MEDIASERVICE" = "auto" ]; then
-            CFG_MEDIASERVICE=no
+        if [ "$CFG_MEDIA_BACKEND" = "auto" ]; then
+            CFG_MEDIA_BACKEND=no
         fi
-        if [ "$CFG_MEDIASERVICE" != "no" ]; then
-            echo "Mediaservice enabled, but GUI disabled."
-            echo " You might need to either enable the GUI or disable Mediaservice"
+        if [ "$CFG_MEDIA_BACKEND" != "no" ]; then
+            echo "Medias backend enabled, but GUI disabled."
+            echo " You might need to either enable the GUI or disable the media backend"
             exit 1
         fi
-    elif [ "$CFG_MEDIASERVICE" = "auto" ]; then
-        CFG_MEDIASERVICE=yes
+    elif [ "$CFG_MEDIA_BACKEND" = "auto" ]; then
+        CFG_MEDIA_BACKEND=yes
     fi
 
     # Auto-detect GStreamer support (needed for both Phonon & QtMultimedia)
-    if [ "$CFG_PHONON" = "yes" -o "$CFG_MULTIMEDIA" = "yes" ]; then
+    if [ "$CFG_PHONON" != "no" -o "$CFG_MEDIASERVICES" != "no" ]; 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`
@@ -6806,10 +6817,10 @@ if [ "$PLATFORM_MAC" = "yes" ]; then
     if [ "$CFG_RPATH" = "yes" ]; then
        QMAKE_CONFIG="$QMAKE_CONFIG absolute_library_soname"
     fi
-elif [ -z "`getQMakeConf \"$XQMAKESPEC\" | grep QMAKE_RPATH | awk '{print $3;}'`" ]; then
+elif [ -z "`getQMakeConf \"$XQMAKESPEC\" | $AWK '/QMAKE_(LFLAGS_)?RPATH/ {print $3;}'`" ]; then
     if [ -n "$RPATH_FLAGS" ]; then
         echo
-        echo "ERROR: -R cannot be used on this platform as \$QMAKE_RPATH is"
+        echo "ERROR: -R cannot be used on this platform as \$QMAKE_LFLAGS_RPATH is"
         echo "       undefined."
         echo
         exit 1
@@ -7018,8 +7029,14 @@ if [ "$CFG_MULTIMEDIA" = "no" ]; then
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MULTIMEDIA"
 else
     QT_CONFIG="$QT_CONFIG multimedia"
-    if [ "$CFG_MEDIASERVICE" = "yes" ]; then
-        QT_CONFIG="$QT_CONFIG mediaservice"
+fi
+
+if [ "$CFG_MEDIASERVICES" = "no" ]; then
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MEDIASERVICES"
+else
+    QT_CONFIG="$QT_CONFIG mediaservices"
+    if [ "$CFG_MEDIA_BACKEND" != "no" ]; then
+        QT_CONFIG="$QT_CONFIG media-backend"
     fi
 fi
 
@@ -7985,6 +8002,7 @@ echo "QtScriptTools module ... $CFG_SCRIPTTOOLS"
 echo "QtXmlPatterns module ... $CFG_XMLPATTERNS"
 echo "Phonon module .......... $CFG_PHONON"
 echo "Multimedia module ...... $CFG_MULTIMEDIA"
+echo "Mediaservices module ... $CFG_MEDIASERVICES"
 echo "SVG module ............. $CFG_SVG"
 echo "WebKit module .......... $CFG_WEBKIT"
 if [ "$CFG_WEBKIT" = "yes" ]; then