summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/qdoc.pro
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2012-05-07 13:54:52 +0200
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2012-05-09 08:34:42 +0200
commit9fde9ab167e52948d337de7fb7b871f7a1d75f43 (patch)
tree0085a0a6d83dbac19e581648d04de262acca825e /src/tools/qdoc/qdoc.pro
parentb3f9978a4d3690e2d77ed4f372788418d72c88cd (diff)
Properly implement a 'make docs' target for subdirs and apps/libs
Only call qdoc for projects which sets the QMAKE_DOCS variable to point to a qdocconf file. Exclude examples/ and tests/ from the qdoc run, by adding no_docs_target to CONFIG for those projects. Change-Id: Ic856c8f19db59309302d0602b3e99735609e525a Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/tools/qdoc/qdoc.pro')
-rw-r--r--src/tools/qdoc/qdoc.pro6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro
index 484b0c6ba1..1e570583f5 100644
--- a/src/tools/qdoc/qdoc.pro
+++ b/src/tools/qdoc/qdoc.pro
@@ -116,4 +116,10 @@ QMAKE_EXTRA_TARGETS += html-docs qch-docs
target.path = $$[QT_HOST_BINS]
INSTALLS += target
+
+# Ensure that qdoc is built before we generate the docs
+docs.commands =
+docs.depends = first
+QMAKE_EXTRA_TARGET += docs
+
load(qt_targets)