Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtbase into newdocs

Change-Id: I7e6cee190a341901dfbf8effb54ebccb91bf7a17

diff --cc configure
index 7866d5a,72eb29a..e8cc561
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1890,7 -1899,7 +1899,7 @@@ while [ "$#" -gt 0 ]; d
          fi
          ;;
      javascript-jit)
--        if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ] || [ "$VAL" = "no" ]; then 
++        if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ] || [ "$VAL" = "no" ]; then
              CFG_JAVASCRIPTCORE_JIT="$VAL"
          else
              UNKNOWN_OPT=yes
@@@ -5211,7 -5230,7 +5230,7 @@@ if [ "$CFG_ALSA" = "auto" ]; the
      fi
  fi
  
--if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then 
++if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then
      if [ "$CFG_ARCH" = "arm" ]; then
         compileTest unix/javascriptcore-jit "javascriptcore-jit"
          if [ $? != "0" ]; then
@@@ -6054,7 -6074,7 +6074,7 @@@ f
  #-------------------------------------------------------------------------------
  QTMODULE="$outpath/mkspecs/qmodule.pri"
  
- echo "CONFIG += $QMAKE_CONFIG create_prl link_prl prepare_docs" >> "$QTMODULE.tmp"
 -echo "CONFIG += $QMAKE_CONFIG create_prl link_prl fix_output_dirs no_private_qt_headers_warning QTDIR_build" >> "$QTMODULE.tmp"
++echo "CONFIG += $QMAKE_CONFIG create_prl link_prl prepare_docs fix_output_dirs no_private_qt_headers_warning QTDIR_build" >> "$QTMODULE.tmp"
  echo "QT_BUILD_PARTS += $CFG_BUILD_PARTS" >> "$QTMODULE.tmp"
  
  if [ -n "$QT_CFLAGS_PSQL" ]; then

diff --cc src/testlib/qtestcase.cpp
Simple merge

diff --cc tools/configure/configureapp.cpp
index e085b87,ca671b5..6280e27
--- 1/tools/configure/configureapp.cpp
--- 2/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@@ -2720,7 -2750,8 +2750,8 @@@ void Configure::generateCachefile(
          if (!dictionary["DECORATIONS"].isEmpty())
              moduleStream << "decorations += "<<dictionary["DECORATIONS"]<<endl;
  
-         moduleStream << "CONFIG += create_prl link_prl prepare_docs";
+         moduleStream << "CONFIG += " << qmakeConfig.join(' ')
 -                     << " create_prl link_prl no_private_qt_headers_warning QTDIR_build";
++                     << " create_prl link_prl prepare_docs no_private_qt_headers_warning QTDIR_build";
          if (dictionary[ "SSE2" ] == "yes")
              moduleStream << " sse2";
          if (dictionary[ "SSE3" ] == "yes")