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

Conflicts:
	configure
	mkspecs/features/create_cmake.prf

Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5

1 files changed, 19 insertions, 5 deletions

diff --git a/configure b/configure
index f2ff5eab77..cdff2c4d5f 100755
--- a/configure
+++ b/configure
@@ -61,6 +61,13 @@ if [ -f "$LICENSE_FILE" ]; then
     diff "${LICENSE_FILE}.tmp" "${LICENSE_FILE}" >/dev/null 2>&1 || LICENSE_FILE="${LICENSE_FILE}.tmp"
 fi
 
+# do this early so we don't store it in config.status
+CFG_TOPLEVEL=
+if [ x"$1" = x"-top-level" ]; then
+    CFG_TOPLEVEL=yes
+    shift
+fi
+
 # later cache the command line in config.status
 OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"`
 
@@ -6067,7 +6074,7 @@ case "$XPLATFORM" in
 	;;
     solaris-cc*)
         # Check the compiler version
-        case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in
+        case `${QMAKE_CONF_COMPILER} -V 2>&1 | $AWK '{print $4}'` in
             5.[012345678])
                 canBuildWebKit="no"
                 canBuildQtXmlPatterns="no"
@@ -6693,11 +6700,9 @@ report_support()
             return
             :;
     esac
-    local heading
     heading=$1
     shift
 
-    local value
     value=$1
     shift
 
@@ -6907,14 +6912,23 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null
 #-------------------------------------------------------------------------------
 
 if [ "$CFG_PROCESS" != "no" ]; then
+(   # fork to make the cd stay local
+
+    relpathMangled=$relpath
+    if [ -n "$CFG_TOPLEVEL" ]; then
+        relpathMangled=`dirname "$relpath"`
+        cd ..
+    fi
 
     if [ "$CFG_PROCESS" = "full" ]; then
         echo "Creating makefiles. Please wait..."
-        "$outpath/bin/qmake" -r "$relpath"
+        "$outpath/bin/qmake" -r "$relpathMangled"
         echo "Done"
     else
-        "$outpath/bin/qmake" "$relpath"
+        "$outpath/bin/qmake" "$relpathMangled"
     fi
+
+)
 fi
 
 #-------------------------------------------------------------------------------