diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2012-05-07 13:54:52 +0200 |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2012-05-09 08:34:42 +0200 |
| commit | 9fde9ab167e52948d337de7fb7b871f7a1d75f43 (patch) | |
| tree | 0085a0a6d83dbac19e581648d04de262acca825e /src/corelib | |
| parent | b3f9978a4d3690e2d77ed4f372788418d72c88cd (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/corelib')
| -rw-r--r-- | src/corelib/corelib.pro | 4 | ||||
| -rw-r--r-- | src/corelib/doc/doc.pri | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index d98cebb672..4856c1b5fb 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -16,6 +16,9 @@ load(qt_module_config) HEADERS += $$QT_SOURCE_TREE/src/corelib/qtcoreversion.h +QMAKE_DOCS = $$PWD/doc/qtcore.qdocconf +QMAKE_DOCS_INDEX = ../../doc + include(animation/animation.pri) include(arch/arch.pri) include(global/global.pri) @@ -30,7 +33,6 @@ 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 deleted file mode 100644 index ed970d7592..0000000000 --- a/src/corelib/doc/doc.pri +++ /dev/null @@ -1,3 +0,0 @@ -qtPrepareTool(QDOC, qdoc) -docs.commands += $$QDOC $$QT.core.sources/doc/qtcore.qdocconf -QMAKE_EXTRA_TARGETS += docs |