From 7d20f3dd1065a20b40cb4689783fba05190fe317 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 29 Oct 2012 12:43:43 +0100 Subject: [PATCH] rewrite default spec handling instead of symlinking (on unix) or creating a forwarding spec (on windows), just put the default specs into (the bootstrapped) QLibraryInfo. Change-Id: I595500ef7399f77cb8ec117c4303bc0a2ffe505f Reviewed-by: Joerg Bornemann Reviewed-by: Thiago Macieira --- configure | 10 +++--- qmake/library/qmakeevaluator.cpp | 14 ++++++-- qmake/property.cpp | 2 ++ qtbase.pro | 10 ------ src/corelib/global/qlibraryinfo.cpp | 8 +++++ src/corelib/global/qlibraryinfo.h | 4 ++- tools/configure/configureapp.cpp | 50 +++++++---------------------- tools/configure/configureapp.h | 1 - 8 files changed, 40 insertions(+), 59 deletions(-) diff --git a/configure b/configure index f9e08643e60..0c621fea419 100755 --- a/configure +++ b/configure @@ -2243,7 +2243,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then mkdir -p "$outpath/mkspecs" rm -rf "$outpath"/mkspecs/* ln -s "$relpath"/mkspecs/* "$outpath/mkspecs" - rm -f "$outpath/mkspecs/default" ShadowMkspecs() { @@ -3527,6 +3526,9 @@ esac #------------------------------------------------------------------------------- [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" +shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` +shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` + cat > "$outpath/src/corelib/global/qconfig.cpp.new" <