AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't duplicate project_build_root's calculation needlessly

Browse Source 
Change-Id: Id2f343c450149b13b52c2cae8eb6eb4bfd73fc03
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-04-27 18:14:56 +02:00
parent 32042413f2
commit e894155a41
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qmake/project.cpp
View File

@ -589,15 +589,10 @@ QStringList qmake_feature_paths(QMakeProperty *prop, bool host_build)
QStringList feature_roots = splitPathList(QString::fromLocal8Bit(qgetenv("QMAKEFEATURES"))); QStringList feature_roots = splitPathList(QString::fromLocal8Bit(qgetenv("QMAKEFEATURES")));
if(prop) if(prop)
feature_roots += splitPathList(prop->value("QMAKEFEATURES")); feature_roots += splitPathList(prop->value("QMAKEFEATURES"));
if(!Option::mkfile::cachefile.isEmpty()) { if (!project_build_root.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);
for(QStringList::Iterator concat_it = concat.begin(); for(QStringList::Iterator concat_it = concat.begin();
concat_it != concat.end(); ++concat_it) 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"))); QStringList qmakepath = splitPathList(QString::fromLocal8Bit(qgetenv("QMAKEPATH")));
foreach (const QString &path, qmakepath) foreach (const QString &path, qmakepath)
foreach (const QString &cat, concat) foreach (const QString &cat, concat)