diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-08 17:19:14 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-10 23:27:03 +0200 |
| commit | 087efb572ace9cbb864c1aab7357916cb7b0428b (patch) | |
| tree | 4896cf5091cff4c40291d23c94b2a1cf445338f2 /src/xml | |
| parent | 9adf7fb708963c7bb27dc1fd54aa879395f6cf57 (diff) | |
Modularize documenation build
qdocconf files can now reference $QT_INSTALL_DOCS to pick up e.g. global
includes, instead of using relative paths. Qt modules will automatically
get a doc target that builds and installs into the right place (including
supporting shadow-builds) if they set QMAKE_DOCS before loading(qt_module).
Change-Id: Ia408385199e56e3ead0afa45645a059d1a8b0d48
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src/xml')
| -rw-r--r-- | src/xml/doc/qtxml.qdocconf | 5 | ||||
| -rw-r--r-- | src/xml/xml.pro | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/xml/doc/qtxml.qdocconf b/src/xml/doc/qtxml.qdocconf index 8ad6c8b780..1759112950 100644 --- a/src/xml/doc/qtxml.qdocconf +++ b/src/xml/doc/qtxml.qdocconf @@ -1,5 +1,5 @@ -include(../../../doc/global/qt-html-templates-offline.qdocconf) -include(../../../doc/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtXml description = Qt XML Reference Documentation @@ -29,7 +29,6 @@ qhp.QtXml.subprojects.examples.title = Qt XML Examples qhp.QtXml.subprojects.examples.indexTitle = Qt XML Examples qhp.QtXml.subprojects.examples.selectors = fake:example -outputdir = ../../../doc/qtxml tagfile = ../../../doc/qtxml/qtxml.tags depends += qtcore diff --git a/src/xml/xml.pro b/src/xml/xml.pro index e6d5761227..80fe3a9ba2 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -6,11 +6,11 @@ QT = core-private DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 +QMAKE_DOCS = $$PWD/doc/qtxml.qdocconf + load(qt_module) HEADERS += qtxmlglobal.h -QMAKE_DOCS = $$PWD/doc/qtxml.qdocconf -QMAKE_DOCS_INDEX = ../../doc PRECOMPILED_HEADER = ../corelib/global/qt_pch.h |