diff options
| -rw-r--r-- | qmake/project.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 48c5540076..545adced43 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -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; } } } |