From 7d20f3dd1065a20b40cb4689783fba05190fe317 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 29 Oct 2012 12:43:43 +0100
Subject: 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 <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/global/qlibraryinfo.cpp | 8 ++++++++
 src/corelib/global/qlibraryinfo.h   | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index ccf071826a..ffdf8d0fd3 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -276,6 +276,8 @@ static const struct {
     { "HostPrefix", "" },
     { "HostBinaries", "bin" },
     { "HostData", "." },
+    { "TargetSpec", "" },
+    { "HostSpec", "" },
 #endif
 };
 
@@ -378,6 +380,12 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group)
 #endif // QT_NO_SETTINGS
     }
 
+#ifdef QT_BOOTSTRAPPED
+    // The specs need to be returned verbatim.
+    if (loc == TargetSpecPath || loc == HostSpecPath)
+        return ret;
+#endif
+
     if (!ret.isEmpty() && QDir::isRelativePath(ret)) {
         QString baseDir;
 #ifdef QT_BOOTSTRAPPED
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
index 1d9b809207..93b0c81562 100644
--- a/src/corelib/global/qlibraryinfo.h
+++ b/src/corelib/global/qlibraryinfo.h
@@ -81,7 +81,9 @@ public:
         HostPrefixPath,
         HostBinariesPath,
         HostDataPath,
-        LastHostPath = HostDataPath,
+        TargetSpecPath,
+        HostSpecPath,
+        LastHostPath = HostSpecPath,
 #endif
         SettingsPath = 100
     };
-- 
cgit v1.2.3