summaryrefslogtreecommitdiffstats
path: root/qmake/project.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-27 18:14:56 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-19 16:46:02 +0200
commite894155a41e6e2d504f8e863e3d3a5b87e909d20 (patch)
tree62a0de9888d91b0d9057c7fdfc3affab198ad753 /qmake/project.cpp
parent32042413f247660e50967d5b0e7e9b63d297da14 (diff)
don't duplicate project_build_root's calculation needlessly
Change-Id: Id2f343c450149b13b52c2cae8eb6eb4bfd73fc03 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/project.cpp')
-rw-r--r--qmake/project.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp
index b6d2143f62..42967df461 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -589,15 +589,10 @@ QStringList qmake_feature_paths(QMakeProperty *prop, bool host_build)
QStringList feature_roots = splitPathList(QString::fromLocal8Bit(qgetenv("QMAKEFEATURES")));
if(prop)
feature_roots += splitPathList(prop->value("QMAKEFEATURES"));
- if(!Option::mkfile::cachefile.isEmpty()) {
- QString path;
- int last_slash = Option::mkfile::cachefile.lastIndexOf(QLatin1Char('/'));
- if(last_slash != -1)
- path = Option::normalizePath(Option::mkfile::cachefile.left(last_slash), false);
+ if (!project_build_root.isEmpty())
for(QStringList::Iterator concat_it = concat.begin();
concat_it != concat.end(); ++concat_it)
- feature_roots << (path + (*concat_it));
- }
+ feature_roots << (project_build_root + (*concat_it));
QStringList qmakepath = splitPathList(QString::fromLocal8Bit(qgetenv("QMAKEPATH")));
foreach (const QString &path, qmakepath)
foreach (const QString &cat, concat)