Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/…

…staging/dev
ALE-Rainbow · Jan 26, 2017 · 398a7e7 · 398a7e7
2 parents 4d3a35f + 318b585
commit 398a7e7
Show file tree

Hide file tree

Showing 267 changed files with 3,158 additions and 3,314 deletions.
diff --git a/.gitignore b/.gitignore
@@ -120,19 +120,22 @@ config.opt
 config.status
 config.summary
 config.log
+config.cache
 mkspecs/default
 mkspecs/default-host
 mkspecs/qconfig.pri
 mkspecs/qdevice.pri
 mkspecs/qfeatures.pri
 mkspecs/qhost.pri
 moc_*.cpp
+qmake/qmake
 qmake/qmake.exe
 qmake/Makefile.bak
 qmake/qmake_pch.pch
 src/corelib/global/qconfig.cpp
 src/corelib/global/qconfig.h
 src/corelib/global/qconfig.h.qmake
+src/corelib/global/qconfig_p.h
 src/corelib/global/qfeatures.h
 src/platformsupport/*_interface.*
 src/platformsupport/*_adaptor.*
@@ -155,6 +158,9 @@ translations/*_untranslated.ts
 qrc_*.cpp
 *.version
 *.version.in
+qt*-config.h
+qt*-config_p.h
+qt*-config.pri
 
 # Test generated files
 QObject.log

diff --git a/config.tests/win/msvc_version.cpp b/config.tests/win/msvc_version.cpp
diff --git a/configure b/configure
@@ -82,6 +82,11 @@ if [ x"$1" = x"-top-level" ]; then
     relpathMangled=`dirname "$relpath"`
     outpathPrefix=../
     shift
+else
+    if [ -f ../.qmake.super ]; then
+        echo >&2 "ERROR: You cannot configure qtbase separately within a top-level build."
+        exit 1
+    fi
 fi
 
 OPT_CMDLINE=  # expanded version for the script
@@ -522,15 +527,25 @@ done
 
 if [ "$OPT_HELP" = "yes" ]; then
     cat $relpath/config_help.txt
+    if [ -n "$CFG_TOPLEVEL" ]; then
+        IFS='
+'
+        for i in $relpathMangled/qt*/config_help.txt; do
+            if [ x"$i" != x"$relpath/config_help.txt" ]; then
+                echo
+                cat "$i"
+            fi
+        done
+    fi
     exit 0
 fi
 
 #-------------------------------------------------------------------------------
 # platform detection
 #-------------------------------------------------------------------------------
 
+PLATFORM_NOTES=
 if [ -z "$PLATFORM" ]; then
-    PLATFORM_NOTES=
     case "$UNAME_SYSTEM:$UNAME_RELEASE" in
      Darwin:*)
         PLATFORM=macx-clang
@@ -540,9 +555,7 @@ if [ -z "$PLATFORM" ]; then
         #PLATFORM=aix-g++-64
         PLATFORM=aix-xlc
         #PLATFORM=aix-xlc-64
-        PLATFORM_NOTES="
-            - Also available for AIX: aix-g++ aix-g++-64 aix-xlc-64
-        "
+        PLATFORM_NOTES="AIX: aix-g++ aix-g++-64 aix-xlc-64"
         ;;
      GNU:*)
         PLATFORM=hurd-g++
@@ -559,14 +572,10 @@ if [ -z "$PLATFORM" ]; then
      FreeBSD:*)
         if [ "$(uname -r | cut -d. -f1)" -ge 10 ]; then
             PLATFORM=freebsd-clang
-            PLATFORM_NOTES="
-                - Also available for FreeBSD: freebsd-g++
-            "
+            PLATFORM_NOTES="FreeBSD: freebsd-g++"
         else
             PLATFORM=freebsd-g++
-            PLATFORM_NOTES="
-                - Also available for FreeBSD: freebsd-clang
-            "
+            PLATFORM_NOTES="FreeBSD: freebsd-clang"
         fi
         ;;
      OpenBSD:*)
@@ -582,58 +591,44 @@ if [ -z "$PLATFORM" ]; then
         #PLATFORM=irix-g++
         PLATFORM=irix-cc
         #PLATFORM=irix-cc-64
-        PLATFORM_NOTES="
-            - Also available for IRIX: irix-g++ irix-cc-64
-        "
+        PLATFORM_NOTES="IRIX: irix-g++ irix-cc-64"
         ;;
      HP-UX:*)
         case "$UNAME_MACHINE" in
             ia64)
                 #PLATFORM=hpuxi-acc-32
                 PLATFORM=hpuxi-acc-64
-                PLATFORM_NOTES="
-                    - Also available for HP-UXi: hpuxi-acc-32
-                "
+                PLATFORM_NOTES="HP-UXi: hpuxi-acc-32"
             ;;
             *)
                 #PLATFORM=hpux-g++
                 PLATFORM=hpux-acc
                 #PLATFORM=hpux-acc-64
                 #PLATFORM=hpux-cc
                 #PLATFORM=hpux-acc-o64
-                PLATFORM_NOTES="
-                    - Also available for HP-UX: hpux-g++ hpux-acc-64 hpux-acc-o64
-                "
+                PLATFORM_NOTES="HP-UX: hpux-g++ hpux-acc-64 hpux-acc-o64"
             ;;
         esac
         ;;
      OSF1:*)
         #PLATFORM=tru64-g++
         PLATFORM=tru64-cxx
-        PLATFORM_NOTES="
-            - Also available for Tru64: tru64-g++
-        "
+        PLATFORM_NOTES="Tru64: tru64-g++"
         ;;
      Linux:*)
         PLATFORM=linux-g++
-        PLATFORM_NOTES="
-            - Also available for Linux: linux-clang linux-kcc linux-icc linux-cxx
-        "
+        PLATFORM_NOTES="Linux: linux-clang linux-kcc linux-icc linux-cxx"
         ;;
      SunOS:5*)
         #PLATFORM=solaris-g++
         PLATFORM=solaris-cc
         #PLATFORM=solaris-cc64
-        PLATFORM_NOTES="
-            - Also available for Solaris: solaris-g++ solaris-cc-64
-        "
+        PLATFORM_NOTES="Solaris: solaris-g++ solaris-cc-64"
         ;;
      ReliantUNIX-*:*|SINIX-*:*)
         PLATFORM=reliant-cds
         #PLATFORM=reliant-cds-64
-        PLATFORM_NOTES="
-            - Also available for Reliant UNIX: reliant-cds-64
-        "
+        PLATFORM_NOTES="Reliant UNIX: reliant-cds-64"
         ;;
      CYGWIN*:*)
         PLATFORM=cygwin-g++
@@ -644,23 +639,17 @@ if [ -z "$PLATFORM" ]; then
      OpenUNIX:*)
         #PLATFORM=unixware-g++
         PLATFORM=unixware-cc
-        PLATFORM_NOTES="
-            - Also available for OpenUNIX: unixware-g++
-        "
+        PLATFORM_NOTES="OpenUNIX: unixware-g++"
         ;;
      UnixWare:*)
         #PLATFORM=unixware-g++
         PLATFORM=unixware-cc
-        PLATFORM_NOTES="
-            - Also available for UnixWare: unixware-g++
-        "
+        PLATFORM_NOTES="UnixWare: unixware-g++"
         ;;
      SCO_SV:*)
         #PLATFORM=sco-g++
         PLATFORM=sco-cc
-        PLATFORM_NOTES="
-            - Also available for SCO OpenServer: sco-g++
-        "
+        PLATFORM_NOTES="SCO OpenServer: sco-g++"
         ;;
      UNIX_SV:*)
         PLATFORM=unixware-g++
@@ -678,6 +667,7 @@ if [ -z "$PLATFORM" ]; then
             exit 2
     esac
 fi
+echo "$PLATFORM_NOTES" > "${outpathPrefix}.config.notes"
 
 #-------------------------------------------------------------------------------
 # command line and environment validation
@@ -895,11 +885,8 @@ Prefix=$relpath
 EOF
 fi
 
-[ -z "$CFG_HOST_QT_TOOLS_PATH" ] && CFG_HOST_QT_TOOLS_PATH="$outpath/bin"
-CFG_QMAKE_PATH="$CFG_HOST_QT_TOOLS_PATH/qmake"
-
 #-------------------------------------------------------------------------------
-# run configure tests
+# configure and build top-level makefile
 #-------------------------------------------------------------------------------
 
 # recreate command line for qmake
@@ -913,40 +900,12 @@ done
 set +f
 IFS=$SAVED_IFS
 
-#-------------------------------------------------------------------------------
-# configure and build top-level makefile
-#-------------------------------------------------------------------------------
-
 if [ -n "$CFG_TOPLEVEL" ]; then
     cd ..
 fi
 
-"$CFG_QMAKE_PATH" -qtconf "$QTCONFFILE" "$relpathMangled" -- "$@" || exit
-
-#-------------------------------------------------------------------------------
-# final notes for the user
-#-------------------------------------------------------------------------------
-
-if [ -n "$PLATFORM_NOTES" ]; then
-    echo
-    echo "Platform notes:"
-    echo "$PLATFORM_NOTES"
-else
-    echo
-fi
-
-QT_INSTALL_PREFIX=`sed -ne 's/^Prefix=//p' < "$outpath/qmake/builtin-qt.conf"`
-MAKE=`basename "$MAKE"`
-echo
-echo Qt is now configured for building. Just run \'$MAKE\'.
-if [ "$outpath" = "$QT_INSTALL_PREFIX" ]; then
-    echo Once everything is built, Qt is installed.
-    echo You should not run \'$MAKE install\'.
+if [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then
+    "$CFG_HOST_QT_TOOLS_PATH/qmake" -qtconf "$QTCONFFILE" "$relpathMangled" -- "$@"
 else
-    echo Once everything is built, you must run \'$MAKE install\'.
-    echo Qt will be installed into $QT_INSTALL_PREFIX
+    "$outpath/bin/qmake" "$relpathMangled" -- "$@"
 fi
-echo
-echo Prior to reconfiguration, make sure you remove any leftovers from
-echo the previous build.
-echo