summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-03-02 17:27:33 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-06 21:50:25 +0100
commit4958c138a79f6597b635aa0ed356f0fbd8fa929c (patch)
tree0285ee751b75a3f99fbfa0535444e185228b757a /qmake
parent092a270afde4fade3dbe36fde7156e5a462a13cb (diff)
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>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/option.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp
index ef613b90ad..b2a1e6982f 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;