From c029fa9db9949f7620f5cd07341bbd076a9dfedb Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Fri, 25 Mar 2011 08:54:17 +0100
Subject: Switched back to using symlinks for all mkspecs on Linux.

This is a partial revert of 7a19192fb418e40732ad72e0d4aaf83527958ded.

The original special case was there to accomodate the fact that
the Symbian master code line does not always build on a symlink
capable file system. However, if we don't use symlinks, qmake's code
to check for the symbian-sbsv2 scope fails if the mkspecs are not
symlinks, so if anyone wants to bring this change back, qmake must be
fixed first.

Strictly speaking it is not necessary to remove both cp's as is done
in this patch, but there is little point in keeping one and not the
other.

Task:     QTBUG-17736
RevBy:    Miikka Heikkinen
---
 configure | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index d1cd0a62c..0a88c85 100755
--- a/configure
+++ b/configure
@@ -4592,12 +4592,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
 
     #mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't be set once configured
     rm -rf mkspecs/default
-    if [ "$XPLATFORM_SYMBIAN_SBSV2" = "yes" ]; then
-#Link is not supported for Symbian build system
-        cp -a mkspecs/`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default
-    else
-        ln -s `echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default
-    fi
+    ln -s `echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default
     # fix makefiles
     for mkfile in GNUmakefile Makefile; do
         EXTRA_LFLAGS=
@@ -7897,12 +7892,7 @@ else
     mv "$outpath/src/corelib/global/qconfig.h.new" "$outpath/src/corelib/global/qconfig.h"
     chmod -w "$outpath/src/corelib/global/qconfig.h"
     for conf in "$outpath/include/QtCore/qconfig.h" "$outpath/include/Qt/qconfig.h"; do
-        if [ "$XPLATFORM_SYMBIAN_SBSV2" = "yes" ]; then
-            [ -e "$conf" ] && rm -rf "$conf"
-            cp -a "$outpath/src/corelib/global/qconfig.h" "$conf"
-        elif [ '!' -f "$conf" ]; then
-            ln -s "$outpath/src/corelib/global/qconfig.h" "$conf"
-        fi
+        ln -s "$outpath/src/corelib/global/qconfig.h" "$conf"
     done
 fi
 #-------------------------------------------------------------------------------
-- 
cgit v0.12