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/sql/doc/qtsql.qdocconf | 5 ++--- src/sql/sql.pro | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/sql') diff --git a/src/sql/doc/qtsql.qdocconf b/src/sql/doc/qtsql.qdocconf index dabe21a44b..185f5064fa 100644 --- a/src/sql/doc/qtsql.qdocconf +++ b/src/sql/doc/qtsql.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 = QtSql description = Qt SQL Reference Documentation @@ -29,7 +29,6 @@ qhp.QtSql.subprojects.examples.title = Qt SQL Examples qhp.QtSql.subprojects.examples.indexTitle = Qt SQL Examples qhp.QtSql.subprojects.examples.selectors = fake:example -outputdir = ../../../doc/qtsql tagfile = ../../../doc/qtsql/qtsql.tags depends += qtcore diff --git a/src/sql/sql.pro b/src/sql/sql.pro index abb5767d04..42d3364192 100644 --- a/src/sql/sql.pro +++ b/src/sql/sql.pro @@ -6,15 +6,14 @@ QT = core-private DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x62000000 +QMAKE_DOCS = $$PWD/doc/qtsql.qdocconf + load(qt_module) DEFINES += QT_NO_CAST_FROM_ASCII PRECOMPILED_HEADER = ../corelib/global/qt_pch.h SQL_P = sql -QMAKE_DOCS = $$PWD/doc/qtsql.qdocconf -QMAKE_DOCS_INDEX = ../../doc - include(kernel/kernel.pri) include(drivers/drivers.pri) include(models/models.pri) -- cgit v1.2.3