diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-23 18:56:11 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-01 23:12:05 +0100 |
commit | 8e5eb1bddcfc71f70604c9d9916659e6cbc66845 (patch) | |
tree | c3a5498adfc90148ee830ad818a540658a26baf8 | |
parent | 022ff04a6bb76f18b8b4d0a8bbcb2b21bd771546 (diff) |
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>
-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; } } } |