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/concurrent | |
| 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/concurrent')
| -rw-r--r-- | src/concurrent/concurrent.pro | 5 | ||||
| -rw-r--r-- | src/concurrent/doc/qtconcurrent.qdocconf | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index f30f75e46e..cfa76ff130 100644 --- a/src/concurrent/concurrent.pro +++ b/src/concurrent/concurrent.pro @@ -7,6 +7,8 @@ CONFIG += exceptions DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 +QMAKE_DOCS = $$PWD/doc/qtconcurrent.qdocconf + load(qt_module) PRECOMPILED_HEADER = ../corelib/global/qt_pch.h @@ -37,9 +39,6 @@ HEADERS += \ # private headers HEADERS += \ -QMAKE_DOCS = $$PWD/doc/qtconcurrent.qdocconf -QMAKE_DOCS_INDEX = ../../doc - contains(QT_CONFIG, clock-gettime) { linux-*|hpux-*|solaris-*:LIBS *= -lrt } diff --git a/src/concurrent/doc/qtconcurrent.qdocconf b/src/concurrent/doc/qtconcurrent.qdocconf index 3c45df4764..47a3e2f497 100644 --- a/src/concurrent/doc/qtconcurrent.qdocconf +++ b/src/concurrent/doc/qtconcurrent.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 = QtConcurrent description = Qt Concurrent Reference Documentation @@ -29,7 +29,6 @@ qhp.QtConcurrent.subprojects.examples.title = Qt Concurrent Examples qhp.QtConcurrent.subprojects.examples.indexTitle = Qt Concurrent Examples qhp.QtConcurrent.subprojects.examples.selectors = fake:example -outputdir = ../../../doc/qtconcurrent tagfile = ../../../doc/qtconcurrent/qtconcurrent.tags depends += qtcore |