From b6b6e85f6b0f75898afc341a8792626ebb9b99ee Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 4 May 2012 20:02:35 +0200 Subject: 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 --- qmake/generators/metamakefile.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'qmake/generators/metamakefile.cpp') 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) { -- cgit v1.2.3