look for features relative to spec only in advertized place
that is, spec/../features/ (i.e., mkspecs/features/) - and not any directory up to the root. Change-Id: Ie5fdf2898fba5ac93583571edc24629471604798 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
This commit is contained in:
parent
022ff04a6b
commit
8e5eb1bddc
@ -578,15 +578,12 @@ QStringList qmake_feature_paths(QMakeProperty *prop=0)
|
||||
feature_roots << Option::mkfile::qmakespec + QLatin1String("/features");
|
||||
if(!Option::mkfile::qmakespec.isEmpty()) {
|
||||
QFileInfo specfi(Option::mkfile::qmakespec);
|
||||
QDir specdir(specfi.absoluteFilePath());
|
||||
while(!specdir.isRoot()) {
|
||||
if(!specdir.cdUp() || specdir.isRoot())
|
||||
break;
|
||||
if(QFile::exists(specdir.path() + QLatin1String("/features"))) {
|
||||
if (!specfi.isRoot()) {
|
||||
QDir specdir(specfi.absolutePath());
|
||||
if (specdir.exists(QLatin1String("features"))) {
|
||||
for(QStringList::Iterator concat_it = concat.begin();
|
||||
concat_it != concat.end(); ++concat_it)
|
||||
feature_roots << (specdir.path() + (*concat_it));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user