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/printsupport/doc/qtprintsupport.qdocconf | 5 ++--- src/printsupport/printsupport.pro | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/printsupport') diff --git a/src/printsupport/doc/qtprintsupport.qdocconf b/src/printsupport/doc/qtprintsupport.qdocconf index bb5536cdfc..45d8225549 100644 --- a/src/printsupport/doc/qtprintsupport.qdocconf +++ b/src/printsupport/doc/qtprintsupport.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 = QtPrintSupport description = Qt Print Support Reference Documentation @@ -29,7 +29,6 @@ qhp.QtPrintSupport.subprojects.examples.title = Qt Print Support Examples qhp.QtPrintSupport.subprojects.examples.indexTitle = Qt Print Support Examples qhp.QtPrintSupport.subprojects.examples.selectors = fake:example -outputdir = ../../../doc/qtprintsupport tagfile = ../../../doc/qtprintsupport/qtprintsupport.tags depends += qtcore qtgui qtwidgets diff --git a/src/printsupport/printsupport.pro b/src/printsupport/printsupport.pro index bbcbb026b4..bc8b3936ce 100644 --- a/src/printsupport/printsupport.pro +++ b/src/printsupport/printsupport.pro @@ -5,10 +5,9 @@ QT = core-private gui-private widgets-private DEFINES += QT_NO_USING_NAMESPACE -load(qt_module) - QMAKE_DOCS = $$PWD/doc/qtprintsupport.qdocconf -QMAKE_DOCS_INDEX = ../../doc + +load(qt_module) QMAKE_LIBS += $$QMAKE_LIBS_PRINTSUPPORT -- cgit v1.2.3