diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-10 16:49:13 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:46:04 +0200 |
| commit | 426d1ef0c1bade15206b48e917bf75412b8bb27b (patch) | |
| tree | d067f9b1edf4f7066165e52ed86b402e45daa5bc | |
| parent | 98470fd9be119dbb1f4d66ca5d1c647ef6128f94 (diff) | |
allow projects to suppress qmake recursion
webkit does some unholy tricks with the ordering of qmake and make
invocations, so it does not work with qmake -r. to make it still
possible to integrate it into the qt5 aggregator project, give it a
chance to "break out" from the recursion.
Change-Id: I926836e44c0e0790cdd90e6b0c8f766dccc33c4d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | qmake/generators/metamakefile.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index c69d5a5812..0603020ae4 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -300,6 +300,8 @@ SubdirsMetaMakefileGenerator::init() bool recurse = Option::recursive == Option::QMAKE_RECURSIVE_YES || (Option::recursive == Option::QMAKE_RECURSIVE_DEFAULT && project->isRecursive()); + if (recurse && project->isActiveConfig("dont_recurse")) + recurse = false; if(recurse) { QString old_output_dir = Option::output_dir; QString old_output = Option::output.fileName(); |