summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-17 14:30:15 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-27 09:39:50 +0200
commit88b4ee22c9b3bf4bc94048df259c50b90d783e8f (patch)
treee9fa204f06fa398534d5205ed451f4f7a9e6d3b4
parent5ced28ed3f7b8fc501742500aa32ebed7272a4fc (diff)
prune feature search paths which don't actually exist
this should significantly cut down the time wasted looking for files in non-existing directories, in particular on windows. Change-Id: I7ab3523fe8c028e3787ebc78e4543ab04f53448e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rw-r--r--qmake/project.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 53f8d544fb..92c07825cb 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -627,7 +627,12 @@ QStringList qmake_feature_paths(QMakeProperty *prop, bool host_build)
QLibraryInfo::EffectivePaths) +
mkspecs_concat + (*concat_it));
feature_roots.removeDuplicates();
- return feature_roots;
+
+ QStringList ret;
+ foreach (const QString &root, feature_roots)
+ if (QFileInfo(root).exists())
+ ret << root;
+ return ret;
}
QStringList qmake_mkspec_paths()