From 087efb572ace9cbb864c1aab7357916cb7b0428b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 8 Oct 2012 17:19:14 +0200 Subject: Modularize documenation build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ø --- src/xml/doc/qtxml.qdocconf | 5 ++--- src/xml/xml.pro | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/xml') 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 -- cgit v1.2.3