Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Build fix for Sun Studio
  Finish to resolve merge conflict.
  Fixes QMenu to only have static POD members
  QScript: Test against QMetaType::QVariant instead of against the string
  Fixes tst_QScriptExtQObject::connectAndDisconnect
  Fix source compatibility of qRegisterMetaType
  Fix warnings on MSVC
  Updating documentation for how to build QWS with tslib
  sizeHint of checkbox/radiobutton without text is not correct
  Some cleanup of outdated src/3rdparty stuff
  Revert "Fixes crash when destroying a QGraphicsItem."
  Add config.test for multimedia/qml
  Fix QVariant autotest
  Fix compilation of Q_DECLARE_METATYPE(QVariant) by introducing QMetaType::QVariant
  fixed a memory leak when restoring a state in QMainWindow
  Make the sub-menu accessible via its shortcut even if it is the current
  remove a warning on windows and simplify a bit the code
  Add and use QGLContextPrivate::eglSurfaceForDevice()
  QMetaType: Now we can register typedefs.

1 files changed, 15 insertions, 0 deletions

diff --git a/configure b/configure
index 2312165..7ac4ff0 100755
--- a/configure
+++ b/configure
@@ -784,6 +784,7 @@ OPT_HELP=
 CFG_SILENT=no
 CFG_GRAPHICS_SYSTEM=default
 CFG_ALSA=auto
+CFG_PULSEAUDIO=auto
 CFG_NETWORKMANAGER=auto
 CFG_COREWLAN=auto
 
@@ -5945,6 +5946,14 @@ if [ "$CFG_ALSA" = "auto" ]; then
     fi
 fi
 
+if [ "$CFG_PULSEAUDIO" = "auto" ]; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/pulseaudio "pulseaudio" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        CFG_PULSEAUDIO=yes
+    else
+        CFG_PULSEAUDIO=no
+    fi
+fi
+
 if [ "$CFG_NETWORKMANAGER" = "auto" ]; then
     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/networkmanager "NetworkManager" $L_FLAGS $I_FLAGS $l_FLAGS; then
         CFG_NETWORKMANAGER=yes
@@ -6439,6 +6448,10 @@ if [ "$CFG_ALSA" = "yes" ]; then
     QT_CONFIG="$QT_CONFIG alsa"
 fi
 
+if [ "$CFG_PULSEAUDIO" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG pulseaudio"
+fi
+
 if [ "$CFG_NETWORKMANAGER" = "yes" ]; then
     QT_CONFIG="$QT_CONFIG networkmanager"
 fi
@@ -7154,6 +7167,7 @@ fi
 [ "$CFG_XRANDR" = "runtime" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XRANDR"
 [ "$CFG_XINPUT" = "runtime" ]    && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINPUT"
 [ "$CFG_ALSA" = "no" ]           && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ALSA"
+[ "$CFG_PULSEAUDIO" = "no" ]          && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PULSEAUDIO"
 [ "$CFG_NETWORKMANAGER" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NETWORKMANAGER"
 [ "$CFG_COREWLAN" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_COREWLAN"
 
@@ -7657,6 +7671,7 @@ elif [ "$CFG_OPENSSL" = "linked" ]; then
 fi
 echo "OpenSSL support ........ $CFG_OPENSSL $OPENSSL_LINKAGE"
 echo "Alsa support ........... $CFG_ALSA"
+echo "Pulse Audio support .... $CFG_PULSEAUDIO"
 echo "NetworkManager support . $CFG_NETWORKMANAGER"
 if [ "$PLATFORM_MAC" = "yes" ]; then
     echo "CoreWlan support ....... $CFG_COREWLAN"