summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-02-22 19:33:53 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-28 09:13:00 +0100
commitbf29a8a27dad02f4956695e60e5be929e5ede039 (patch)
tree9139fb4e6a294b119061127d96fc6d150a3939fa
parentdd7befcfd84a9a648fa467dda3fe45988bfc5604 (diff)
don't look for features in PrefixPath
it's generally redundant with DataPath which we already look into. this is consistent with where mkspecs are looked for. i don't think anyone will notice this "loss" ... Change-Id: Iab7c35cc22ba53e1005f26b5d85d41cf4dafad07 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rw-r--r--qmake/project.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp
index eb07dea654..0445c8eee9 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -592,10 +592,6 @@ QStringList qmake_feature_paths(QMakeProperty *prop=0)
}
for(QStringList::Iterator concat_it = concat.begin();
concat_it != concat.end(); ++concat_it)
- feature_roots << (QLibraryInfo::location(QLibraryInfo::PrefixPath) +
- mkspecs_concat + (*concat_it));
- for(QStringList::Iterator concat_it = concat.begin();
- concat_it != concat.end(); ++concat_it)
feature_roots << (QLibraryInfo::location(QLibraryInfo::DataPath) +
mkspecs_concat + (*concat_it));
return feature_roots;