AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't look for features in PrefixPath

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-02-22 19:33:53 +01:00 committed by Qt by Nokia
parent dd7befcfd8
commit bf29a8a27d
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/project.cpp
View File

@ -590,10 +590,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(); for(QStringList::Iterator concat_it = concat.begin();
concat_it != concat.end(); ++concat_it) concat_it != concat.end(); ++concat_it)
feature_roots << (QLibraryInfo::location(QLibraryInfo::DataPath) + feature_roots << (QLibraryInfo::location(QLibraryInfo::DataPath) +