summaryrefslogtreecommitdiffstats
path: root/qmake/generators/metamakefile.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'qmake/generators/metamakefile.cpp')
-rw-r--r--qmake/generators/metamakefile.cpp9
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) {