From 88b4ee22c9b3bf4bc94048df259c50b90d783e8f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 17 Apr 2012 14:30:15 +0200 Subject: [PATCH] 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 --- qmake/project.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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()