Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	src/network/access/qnetworkreply.cpp
	tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp

Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad

1 files changed, 15 insertions, 64 deletions

diff --git a/configure b/configure
index 8827e63a78..73679de621 100755
--- a/configure
+++ b/configure
@@ -73,6 +73,15 @@ if [ -z "$MAKE" ]; then
     export MAKE
 fi
 
+# make sure qmake is not confused by these. recursion via Makefiles would
+# be still affected, so just unsetting them here is not an option.
+if [ -n "$QMAKESPEC" ] || [ -n "$XQMAKESPEC" ] || \
+        [ -n "$QMAKEPATH" ] || [ -n "$QMAKEFEATURES" ]; then
+    echo >&2 "Please make sure to unset the QMAKESPEC, XQMAKESPEC, QMAKEPATH,"
+    echo >&2 "and QMAKEFEATURES environment variables prior to building Qt."
+    exit 1
+fi
+
 # do this early so we don't store it in config.status
 CFG_TOPLEVEL=
 relpathMangled=$relpath
@@ -552,23 +561,12 @@ if [ -z "$PLATFORM" ]; then
         ;;
      AIX:*)
         #PLATFORM=aix-g++
-        #PLATFORM=aix-g++-64
-        PLATFORM=aix-xlc
-        #PLATFORM=aix-xlc-64
-        PLATFORM_NOTES="AIX: aix-g++ aix-g++-64 aix-xlc-64"
+        PLATFORM=aix-g++-64
+        PLATFORM_NOTES="AIX: aix-g++ aix-g++-64"
         ;;
      GNU:*)
         PLATFORM=hurd-g++
         ;;
-     dgux:*)
-        PLATFORM=dgux-g++
-        ;;
-#     DYNIX/ptx:4*)
-#       PLATFORM=dynix-g++
-#       ;;
-     ULTRIX:*)
-        PLATFORM=ultrix-g++
-        ;;
      FreeBSD:*)
         if [ "$(uname -r | cut -d. -f1)" -ge 10 ]; then
             PLATFORM=freebsd-clang
@@ -584,51 +582,22 @@ if [ -z "$PLATFORM" ]; then
      NetBSD:*)
         PLATFORM=netbsd-g++
         ;;
-     BSD/OS:*|BSD/386:*)
-        PLATFORM=bsdi-g++
-        ;;
-     IRIX*:*)
-        #PLATFORM=irix-g++
-        PLATFORM=irix-cc
-        #PLATFORM=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="HP-UXi: hpuxi-acc-32"
-            ;;
-            *)
-                #PLATFORM=hpux-g++
-                PLATFORM=hpux-acc
-                #PLATFORM=hpux-acc-64
-                #PLATFORM=hpux-cc
-                #PLATFORM=hpux-acc-o64
-                PLATFORM_NOTES="HP-UX: hpux-g++ hpux-acc-64 hpux-acc-o64"
+                PLATFORM=hpuxi-g++-64
             ;;
         esac
         ;;
-     OSF1:*)
-        #PLATFORM=tru64-g++
-        PLATFORM=tru64-cxx
-        PLATFORM_NOTES="Tru64: tru64-g++"
-        ;;
      Linux:*)
         PLATFORM=linux-g++
-        PLATFORM_NOTES="Linux: linux-clang linux-kcc linux-icc linux-cxx"
+        PLATFORM_NOTES="Linux: linux-clang linux-icc"
         ;;
      SunOS:5*)
-        #PLATFORM=solaris-g++
+        #PLATFORM=solaris-g++-64
         PLATFORM=solaris-cc
         #PLATFORM=solaris-cc64
-        PLATFORM_NOTES="Solaris: solaris-g++ solaris-cc-64"
-        ;;
-     ReliantUNIX-*:*|SINIX-*:*)
-        PLATFORM=reliant-cds
-        #PLATFORM=reliant-cds-64
-        PLATFORM_NOTES="Reliant UNIX: reliant-cds-64"
+        PLATFORM_NOTES="Solaris: solaris-g++-64 solaris-cc-64"
         ;;
      CYGWIN*:*)
         PLATFORM=cygwin-g++
@@ -636,24 +605,6 @@ if [ -z "$PLATFORM" ]; then
      LynxOS*:*)
         PLATFORM=lynxos-g++
         ;;
-     OpenUNIX:*)
-        #PLATFORM=unixware-g++
-        PLATFORM=unixware-cc
-        PLATFORM_NOTES="OpenUNIX: unixware-g++"
-        ;;
-     UnixWare:*)
-        #PLATFORM=unixware-g++
-        PLATFORM=unixware-cc
-        PLATFORM_NOTES="UnixWare: unixware-g++"
-        ;;
-     SCO_SV:*)
-        #PLATFORM=sco-g++
-        PLATFORM=sco-cc
-        PLATFORM_NOTES="SCO OpenServer: sco-g++"
-        ;;
-     UNIX_SV:*)
-        PLATFORM=unixware-g++
-        ;;
      QNX:*)
         PLATFORM=unsupported/qnx-g++
         ;;