From 39fcc3080fc302dfcaeea0a4c9fbb0e8052ead0e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 8 May 2012 10:09:38 +0200 Subject: [PATCH] don't resolve paths when looking for features all the input paths are expected to be already resolved Change-Id: I2c9b4fb5ed25aea160669dd45fe5a4f7f3e272f1 Reviewed-by: Daniel Teske Reviewed-by: Oswald Buddenhagen --- src/shared/proparser/qmakeevaluator.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index a2713cca659..a98834859d0 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -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)) {