diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-04 21:25:05 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-05 17:29:46 +0100 |
| commit | 4404cd51657ef99ee90a84bbe2e0ee26ac281230 (patch) | |
| tree | aa3e6646727c04ee6173ddaffe592b913dd4c977 /mkspecs/features/qt_docs.prf | |
| parent | dab346fa259f3fe38e4def73e5d7c0a447a17e5e (diff) | |
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 <qthjk@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/features/qt_docs.prf')
| -rw-r--r-- | mkspecs/features/qt_docs.prf | 1 |
1 files changed, 0 insertions, 1 deletions
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 } |