feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

don't resolve paths when looking for features

Browse Source 
all the input paths are expected to be already resolved

Change-Id: I2c9b4fb5ed25aea160669dd45fe5a4f7f3e272f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-05-08 10:09:38 +02:00
parent 6a54c5e667
commit 39fcc3080f
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -1074,7 +1074,7 @@ QStringList QMakeEvaluator::qmakeFeaturePaths() const
QStringList feature_roots;
foreach (const QString &f, m_option->getPathListEnv(QLatin1String("QMAKEFEATURES")))
feature_roots += resolvePath(f);
feature_roots += f;
feature_roots += propertyValue(QLatin1String("QMAKEFEATURES"), false).split(
m_option->dirlist_sep, QString::SkipEmptyParts);
@@ -1085,18 +1085,15 @@ QStringList QMakeEvaluator::qmakeFeaturePaths() const
feature_roots << (path + concat_it);
}
foreach (const QString &item, m_option->getPathListEnv(QLatin1String("QMAKEPATH"))) {
QString citem = resolvePath(item);
foreach (const QString &item, m_option->getPathListEnv(QLatin1String("QMAKEPATH")))
foreach (const QString &concat_it, concat)
feature_roots << (citem + mkspecs_concat + concat_it);
}
feature_roots << (item + mkspecs_concat + concat_it);
if (!m_option->qmakespec.isEmpty()) {
QString qmakespec = resolvePath(m_option->qmakespec);
feature_roots << (qmakespec + features_concat);
feature_roots << (m_option->qmakespec + features_concat);
// Also check directly under the root directory of the mkspecs collection
QDir specdir(qmakespec);
QDir specdir(m_option->qmakespec);
while (!specdir.isRoot() && specdir.cdUp()) {
const QString specpath = specdir.path();
if (specpath.endsWith(mkspecs_concat)) {