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/network | |
| 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/network')
| -rw-r--r-- | src/network/doc/qtnetwork.qdocconf | 5 | ||||
| -rw-r--r-- | src/network/network.pro | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/network/doc/qtnetwork.qdocconf b/src/network/doc/qtnetwork.qdocconf index cd09a8a0df..24298c1efd 100644 --- a/src/network/doc/qtnetwork.qdocconf +++ b/src/network/doc/qtnetwork.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 = QtNetwork description = Qt Network Reference Documentation @@ -29,7 +29,6 @@ qhp.QtNetwork.subprojects.examples.title = Qt Network Examples qhp.QtNetwork.subprojects.examples.indexTitle = Qt Network Examples qhp.QtNetwork.subprojects.examples.selectors = fake:example -outputdir = ../../../doc/qtnetwork tagfile = ../../../doc/qtnetwork/qtnetwork.tags depends += qtcore diff --git a/src/network/network.pro b/src/network/network.pro index 60fb56bdc1..09791d7f6d 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -13,10 +13,9 @@ DEFINES += QT_NO_USING_NAMESPACE #DEFINES += QUDPSOCKET_DEBUG QUDPSERVER_DEBUG win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000 -load(qt_module) - QMAKE_DOCS = $$PWD/doc/qtnetwork.qdocconf -QMAKE_DOCS_INDEX = ../../doc + +load(qt_module) include(access/access.pri) include(bearer/bearer.pri) |