Merge remote branch 'lighthouse/4.7' into lighthouse-master

Conflicts:
	src/plugins/bearer/connman/qconnmanservice_linux.cpp
	tests/auto/qpainter/tst_qpainter.cpp

1 files changed, 10 insertions, 5 deletions

diff --git a/configure b/configure
index 1d7a5ff..a8d8610 100755
--- a/configure
+++ b/configure
@@ -2535,10 +2535,15 @@ if [ "$OPT_SHADOW" = "yes" ]; then
     # Special case for mkspecs/features directory.
     # To be able to place .prf files into a shadow build directory,
     # we're creating links for files only. The directory structure is reproduced.
-    # A simple "cp -rs" doesn't work on Mac. :(
     rm -rf "$outpath/mkspecs/features"
-    find "$relpath/mkspecs/features" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p
-    find "$relpath/mkspecs/features" -type f | sed "s,^$relpath/,," | xargs -n 1 -I % ln -s "$relpath/%" "$outpath/%"
+    if [ "$UNAME_SYSTEM" = "Linux" ]; then
+        # This works with GNU coreutils, and is needed for ScratchBox
+        cp -rs "$relpath/mkspecs/features" "$outpath/mkspecs/features"
+    else
+        # A simple "cp -rs" doesn't work on Mac. :(
+        find "$relpath/mkspecs/features" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p
+        find "$relpath/mkspecs/features" -type f | sed "s,^$relpath/,," | xargs -n 1 -I % ln -s "$relpath/%" "$outpath/%"
+    fi
 
     # symlink the doc directory
     rm -rf "$outpath/doc"
@@ -3807,8 +3812,8 @@ fi
     -no-scripttools .... Do not build the QtScriptTools module.
  +  -scripttools ....... Build the QtScriptTools module.
 
- +  -no-declarative .....Do not build the declarative module.
-    -declarative ....... Build the declarative module.
+    -no-declarative .....Do not build the declarative module.
+ +  -declarative ....... Build the declarative module.
 
     -platform target ... The operating system and compiler you are building
                          on ($PLATFORM).