summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-12 22:03:26 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-07-04 14:05:13 +0200
commit9e1116c73bbc72bd88ea321d2914aca493091d5f (patch)
tree07146785d5ac11f18a9b75057077155ca432238c /src/shared
parent755d093617bd4ec52dd728bd003fce858b083739 (diff)
downloadqt-creator-9e1116c73bbc72bd88ea321d2914aca493091d5f.tar.gz
prune feature search paths which don't actually exist
follow suit with qmake ... Change-Id: Ifd84044f0543a80cdabee980185cc2e8bd492ea6 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/proparser/qmakeevaluator.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp
index b12e9b1a3b..192b3859a2 100644
--- a/src/shared/proparser/qmakeevaluator.cpp
+++ b/src/shared/proparser/qmakeevaluator.cpp
@@ -1175,7 +1175,11 @@ QStringList QMakeEvaluator::qmakeFeaturePaths() const
feature_roots.removeDuplicates();
- return feature_roots;
+ QStringList ret;
+ foreach (const QString &root, feature_roots)
+ if (IoUtils::exists(root))
+ ret << root;
+ return ret;
}
QString QMakeEvaluator::propertyValue(const QString &name, bool complain) const