summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2012-04-20 13:56:50 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-23 09:45:24 +0200
commit3a78aabf3f76abf403556d56d0a6bbf1294b3967 (patch)
tree7cbefc83a343e5d81b7fd169211ab92f513e6fb1 /src/corelib
parent8d9cb38a66e01356bd41d24e5e3b8b206065f941 (diff)
QDoc: Support -indexdir on CLI and depends in qdocconf.
You can now specify a list of modules in the "depends" qdocconf variable. This stringlist is then used by the -indexdir option to specify in which directory to search for [depends entry]/[depends entry].index Change-Id: Icab6dd0133e180ac04365da9605743def6fb754d Reviewed-by: Martin Smith <martin.smith@nokia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/corelib.pro1
-rw-r--r--src/corelib/doc/doc.pri2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index 4d1dc1b813..d98cebb672 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -30,6 +30,7 @@ include(codecs/codecs.pri)
include(statemachine/statemachine.pri)
include(mimetypes/mimetypes.pri)
include(xml/xml.pri)
+include(doc/doc.pri)
mac|darwin {
!ios {
diff --git a/src/corelib/doc/doc.pri b/src/corelib/doc/doc.pri
new file mode 100644
index 0000000000..8f69c5df45
--- /dev/null
+++ b/src/corelib/doc/doc.pri
@@ -0,0 +1,2 @@
+docs.commands += $$QT.core.bins/qdoc $$QT.core.sources/doc/qtcore.qdocconf
+QMAKE_EXTRA_TARGETS += docs