From 4404cd51657ef99ee90a84bbe2e0ee26ac281230 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 4 Dec 2012 21:25:05 +0100 Subject: fix doc target recursions in particular for the meta Makefiles of debug_and_release. the logic is as follows: - the meta targets ('html_docs' in prepare_docs mode, and 'docs' always) need to branch out asap, so they are implemented non-recursively in every makefile. - all other targets need to be fully recursive. the meta Makefile will recurse only into one of debug or release, depending on the configure option (it doesn't matter anyway). Change-Id: I4e3f714cdda9c3a1021743148b5ee73379e3484d Reviewed-by: hjk Reviewed-by: Joerg Bornemann Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt_docs.prf | 1 - 1 file changed, 1 deletion(-) (limited to 'mkspecs/features/qt_docs.prf') diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf index 3eb138b96d..0c46301ce4 100644 --- a/mkspecs/features/qt_docs.prf +++ b/mkspecs/features/qt_docs.prf @@ -17,7 +17,6 @@ doc_command = $$QDOC $$QMAKE_DOCS prepare_docs { prepare_docs.commands += $$doc_command -prepare -no-link-errors generate_docs.commands += $$doc_command -generate - html_docs.depends += generate_docs } else { html_docs.commands += $$doc_command } -- cgit v1.2.3