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/testlib | |
| 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/testlib')
| -rw-r--r-- | src/testlib/doc/qttest.qdocconf | 5 | ||||
| -rw-r--r-- | src/testlib/testlib.pro | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/testlib/doc/qttest.qdocconf b/src/testlib/doc/qttest.qdocconf index e965c96313..fd9d6a83d5 100644 --- a/src/testlib/doc/qttest.qdocconf +++ b/src/testlib/doc/qttest.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 = QtTest description = Qt Test Reference Documentation @@ -29,7 +29,6 @@ qhp.QtTest.subprojects.examples.title = Qt Test Examples qhp.QtTest.subprojects.examples.indexTitle = Qt Test Examples qhp.QtTest.subprojects.examples.selectors = fake:example -outputdir = ../../../doc/qttest tagfile = ../../../doc/qttest/qttest.tags depends += qtcore diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index 4dc4c25cbf..c14f6e0687 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -12,7 +12,6 @@ unix:!embedded:QMAKE_PKGCONFIG_DESCRIPTION = Qt \ Library QMAKE_DOCS = $$PWD/doc/qttest.qdocconf -QMAKE_DOCS_INDEX = ../../doc HEADERS = qbenchmark.h \ qbenchmark_p.h \ |