From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 2 Mar 2012 16:27:33 +0000 (+0100)
Subject: don't add bogus /mkspecs to QMAKE_MKSPECS
X-Git-Tag: qt-v5.0.0-alpha1~534
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4958c138a79f6597b635aa0ed356f0fbd8fa929c;p=profile%2Fivi%2Fqtbase.git

don't add bogus /mkspecs to QMAKE_MKSPECS

the project build root can of course be empty - if there is neither an
mkspecs/ nor a .qmake.cache - or no project in the first place (-query).

Change-Id: I9595b0b4ad80a9086dcd48c9ae62b3e8bd1b6f2f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---

diff --git a/qmake/option.cpp b/qmake/option.cpp
index ef613b9..b2a1e69 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -594,7 +594,8 @@ QStringList Option::mkspecPaths()
         for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it)
             ret << ((*it) + concat);
     }
-    ret << Option::mkfile::project_build_root + concat;
+    if (!Option::mkfile::project_build_root.isEmpty())
+        ret << Option::mkfile::project_build_root + concat;
     if (!Option::mkfile::project_root.isEmpty())
         ret << Option::mkfile::project_root + concat;
     ret << QLibraryInfo::location(QLibraryInfo::HostDataPath) + concat;