summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2011-01-28 09:27:33 (GMT)
committeraxis <qt-info@nokia.com>2011-03-04 10:44:33 (GMT)
commit728f0f7d5c1c84ca713cfb34c3d32b65018028d4 (patch)
tree35ba8c9617ead4a3fecb54225067d4bf68124cfc /mkspecs
parentdbbf06e51eafe25d63cf2d0d21a1d92bde5475cc (diff)
downloadQt-728f0f7d5c1c84ca713cfb34c3d32b65018028d4.zip
Qt-728f0f7d5c1c84ca713cfb34c3d32b65018028d4.tar.gz
Qt-728f0f7d5c1c84ca713cfb34c3d32b65018028d4.tar.bz2
Fixed GCCE libdir handling if the paths have spaces in them.
RevBy: Trust me
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/symbian-gcce/qmake.conf18
1 files changed, 9 insertions, 9 deletions
diff --git a/mkspecs/symbian-gcce/qmake.conf b/mkspecs/symbian-gcce/qmake.conf
index 5d0deb7..e83f435 100644
--- a/mkspecs/symbian-gcce/qmake.conf
+++ b/mkspecs/symbian-gcce/qmake.conf
@@ -72,16 +72,16 @@ QMAKE_LFLAGS += --target1-abs \
QMAKE_LIBDIR += $${EPOCROOT}epoc32/release/armv5/udeb/
# g++ knows the path to the gcc-shipped-libs, ld doesn't. So cache the full path in the generate Makefile
-QMAKE_GCC_SEARCH_DIRS =$$system($$QMAKE_CXX -print-search-dirs)
-for(line, QMAKE_GCC_SEARCH_DIRS) {
- contains(line, "libraries:") {
- foundIt="1"
- } else {
- contains(foundIt, "1") {
- QMAKE_LFLAGS += $$replace(line, "[=:]", " -L")
- }
- }
+QMAKE_GCC_SEARCH_DIRS = $$system($$QMAKE_CXX -print-search-dirs)
+QMAKE_GCC_SEARCH_DIRS = "$$join(QMAKE_GCC_SEARCH_DIRS, " ")"
+QMAKE_GCC_SEARCH_DIRS = $$replace(QMAKE_GCC_SEARCH_DIRS, ".*libraries: *", "")
+QMAKE_GCC_SEARCH_DIRS = $$replace(QMAKE_GCC_SEARCH_DIRS, "=", "")
+contains(QMAKE_HOST.os,Windows) {
+ QMAKE_GCC_SEARCH_DIRS = $$split(QMAKE_GCC_SEARCH_DIRS, ;)
+} else {
+ QMAKE_GCC_SEARCH_DIRS = $$split(QMAKE_GCC_SEARCH_DIRS, :)
}
+for(line, QMAKE_GCC_SEARCH_DIRS):QMAKE_LIBDIR += $$line
QMAKE_LIBDIR += $${EPOCROOT}epoc32/release/armv5/lib