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/metamakefile.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/metamakefile.cpp')
-rw-r--r-- | qmake/generators/metamakefile.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index ef47082dce..d023d5e73e 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -281,14 +281,7 @@ SubdirsMetaMakefileGenerator::init() init_flag = true; bool hasError = false; - // It might make sense to bequeath the CONFIG option to the recursed - // projects. OTOH, one would most likely have it in all projects anyway - - // either through a qmakespec, a .qmake.cache or explicitly - as otherwise - // running qmake in a subdirectory would have a different auto-recurse - // setting than in parent directories. - bool recurse = Option::recursive == Option::QMAKE_RECURSIVE_YES - || (Option::recursive == Option::QMAKE_RECURSIVE_DEFAULT - && project->isRecursive()); + bool recurse = Option::recursive; if (recurse && project->isActiveConfig("dont_recurse")) recurse = false; if(recurse) { |