diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-04 20:02:35 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:32 +0200 |
| commit | b6b6e85f6b0f75898afc341a8792626ebb9b99ee (patch) | |
| tree | 86eee5e137e4773634c3c37e391c2230ab2002d4 /qmake/generators/projectgenerator.cpp | |
| parent | 031ac3c167d356e9c853f2c8f4331d5a276c6651 (diff) | |
remove possibility to request project recursion from within a pro file again
the feature was implemented for the abld/sbs2 generators only, and is
of course undocumented.
this reverts most of commit e795e61ef93f8080f9938ac49f2fca306644af85.
Change-Id: Ibd1726b036ce6c45f8e678ea996218f774f8aed2
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'qmake/generators/projectgenerator.cpp')
| -rw-r--r-- | qmake/generators/projectgenerator.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index 98f0e54258..1e5bab669c 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -105,7 +105,7 @@ ProjectGenerator::init() add_depend = true; if(dir.right(1) != Option::dir_sep) dir += Option::dir_sep; - if(Option::recursive == Option::QMAKE_RECURSIVE_YES) { + if (Option::recursive) { QStringList files = QDir(dir).entryList(QDir::Files); for(int i = 0; i < (int)files.count(); i++) { if(files[i] != "." && files[i] != "..") @@ -132,7 +132,7 @@ ProjectGenerator::init() dir = regex.left(s+1); regex = regex.right(regex.length() - (s+1)); } - if(Option::recursive == Option::QMAKE_RECURSIVE_YES) { + if (Option::recursive) { QStringList entries = QDir(dir).entryList(QDir::Dirs); for(int i = 0; i < (int)entries.count(); i++) { if(entries[i] != "." && entries[i] != "..") { @@ -187,7 +187,7 @@ ProjectGenerator::init() subdirs.append(nd); } } - if(Option::recursive == Option::QMAKE_RECURSIVE_YES) { + if (Option::recursive) { QStringList dirs = QDir(newdir).entryList(QDir::Dirs); for(int i = 0; i < (int)dirs.count(); i++) { QString nd = fileFixify(newdir + QDir::separator() + dirs[i]); @@ -224,8 +224,7 @@ ProjectGenerator::init() } } } - if(Option::recursive == Option::QMAKE_RECURSIVE_YES - && !knownDirs.contains(newdir, Qt::CaseInsensitive)) + if (Option::recursive && !knownDirs.contains(newdir, Qt::CaseInsensitive)) knownDirs.append(newdir); } } |