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

stop looking for features outside the mkspecs/ hierarchy

Browse Source 
follow suit to qmake ...

Change-Id: I8f041adbc3305cddaf7dfd016fc83da228b253e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-05-04 19:40:24 +02:00
parent e0657a441f
commit 6a54c5e667
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1095,13 +1095,14 @@ QStringList QMakeEvaluator::qmakeFeaturePaths() const
QString qmakespec = resolvePath(m_option->qmakespec);
feature_roots << (qmakespec + features_concat);
// Also check directly under the root directory of the mkspecs collection
QDir specdir(qmakespec);
while (!specdir.isRoot()) {
if (!specdir.cdUp() || specdir.isRoot())
break;
if (IoUtils::exists(specdir.path() + features_concat)) {
foreach (const QString &concat_it, concat)
feature_roots << (specdir.path() + concat_it);
while (!specdir.isRoot() && specdir.cdUp()) {
const QString specpath = specdir.path();
if (specpath.endsWith(mkspecs_concat)) {
if (IoUtils::exists(specpath + features_concat))
foreach (const QString &concat_it, concat)
feature_roots << (specdir.path() + concat_it);
break;
}
}