diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-06-03 01:48:02 (GMT) |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-06-11 22:31:07 (GMT) |
commit | 09e3e740adfc08723275c8c7d9860d37fc61d8dd (patch) | |
tree | b8e70cdf42ac3e97bc3b4da16f21a7c60041a68e /qmake/generators/makefile.h | |
parent | 35acd2ae3850faa3d06227fcfdbc5d61858c8d7b (diff) | |
download | Qt-09e3e740adfc08723275c8c7d9860d37fc61d8dd.zip Qt-09e3e740adfc08723275c8c7d9860d37fc61d8dd.tar.gz Qt-09e3e740adfc08723275c8c7d9860d37fc61d8dd.tar.bz2 |
Fixed recursive QMAKE_EXTRA_TARGETS not being generated correctly for
SUBDIRS projects when using abld.
Acked-by: Miikka Heikkinen
Diffstat (limited to 'qmake/generators/makefile.h')
-rw-r--r-- | qmake/generators/makefile.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 9896c1d..a6eec52 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -121,9 +121,12 @@ protected: enum SubTargetFlags { SubTargetInstalls=0x01, SubTargetOrdered=0x02, + SubTargetSkipDefaultVariables=0x04, + SubTargetSkipDefaultTargets=0x08, SubTargetsNoFlags=0x00 }; + QList<MakefileGenerator::SubTarget*> findSubDirsSubTargets() const; void writeSubTargets(QTextStream &t, QList<SubTarget*> subtargets, int flags); //extra compiler interface |