summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2012-10-11 16:31:41 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2012-10-12 15:05:31 +0200
commitcb9a4a16773c0a66ecfea854f984d82f0d6a4e05 (patch)
tree6412405874dce999c420c8453a6b479c46837b58
parentaa3361c77e6f15d1bfd9f9289023e4ba515987b6 (diff)
Prevent 'make docs' (from qt5.git) from generating monolithic docs
We don't want to recurse into the qtdoc repo and do a full monolithic doc build as part of a modularized docs build of qt5.git. At some point we'll have to factor out the global/generic docs out of this repo into a qglobaldocs repo, or just throw away all the monotholitic stuff and keep the generic docs here. Change-Id: I646350ca2dea0756877179b39519616ef7e173ff Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
-rw-r--r--qtdoc.pro4
1 files changed, 1 insertions, 3 deletions
diff --git a/qtdoc.pro b/qtdoc.pro
index 3230fdb7b..c6e0ef9e0 100644
--- a/qtdoc.pro
+++ b/qtdoc.pro
@@ -15,9 +15,7 @@ qch_docs.CONFIG = recursive
qch_docs.recurse_target = qch_docs
qch_docs.recurse = doc
-docs.CONFIG = recursive
-docs.recurse_target = docs
-docs.recurse = doc
+docs.commands = @echo $$shell_quote(Please use specific targets for monolithic docs (online_docs, dita_docs, qch_docs))
QMAKE_EXTRA_TARGETS += online_docs qch_docs docs dita_docs