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/dbus | |
| 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/dbus')
| -rw-r--r-- | src/dbus/dbus.pro | 4 | ||||
| -rw-r--r-- | src/dbus/doc/qtdbus.qdocconf | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 6c6e9fcc83..1793871de6 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -26,10 +26,10 @@ win32 { CONFIG(debug, debug|release):LIBS_PRIVATE += -ldbus-1d else:LIBS_PRIVATE += -ldbus-1 } -load(qt_module) QMAKE_DOCS = $$PWD/doc/qtdbus.qdocconf -QMAKE_DOCS_INDEX = ../../doc + +load(qt_module) PUB_HEADERS = qdbusargument.h \ qdbusconnectioninterface.h \ diff --git a/src/dbus/doc/qtdbus.qdocconf b/src/dbus/doc/qtdbus.qdocconf index 7e869df1a7..f60b8e649e 100644 --- a/src/dbus/doc/qtdbus.qdocconf +++ b/src/dbus/doc/qtdbus.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 = QtDBus description = Qt DBus Reference Documentation @@ -29,7 +29,6 @@ qhp.QtDBus.subprojects.examples.title = Qt DBus Examples qhp.QtDBus.subprojects.examples.indexTitle = Qt DBus Examples qhp.QtDBus.subprojects.examples.selectors = fake:example -outputdir = ../../../doc/qtdbus tagfile = ../../../doc/qtdbus/qtdbus.tags depends += qtcore |