Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Added license headers to new files.
  use intel linker and librarian with icc
  create missing output directories for substituted files
  fix shadow builds with scratchbox
  QMake/Win32/MinGW: Fix ar script generating with absolute paths
  Crash in QWidgetPrivate::init on QApplication::quit() using a modal dialog on Mac
  Crash in QX11PaintEngine::drawPixmap
  Revert "Fix the rendering of lines with the X11 paint engine"
  Revert "Outline / fill inconsistency in X11 paint engine."

1 files changed, 8 insertions, 3 deletions

diff --git a/configure b/configure
index 7c3f9a3..bd69a0a 100755
--- a/configure
+++ b/configure
@@ -2414,10 +2414,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"