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/widgets | |
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/widgets')
-rw-r--r-- | src/widgets/doc/qtwidgets.qdocconf | 5 | ||||
-rw-r--r-- | src/widgets/widgets.pro | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/widgets/doc/qtwidgets.qdocconf b/src/widgets/doc/qtwidgets.qdocconf index 6a7815d9a2..5487d1ed08 100644 --- a/src/widgets/doc/qtwidgets.qdocconf +++ b/src/widgets/doc/qtwidgets.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 = QtWidgets description = Qt Widgets Reference Documentation @@ -29,7 +29,6 @@ qhp.QtWidgets.subprojects.examples.title = Qt Widgets Examples qhp.QtWidgets.subprojects.examples.indexTitle = Qt Widgets Examples qhp.QtWidgets.subprojects.examples.selectors = fake:example -outputdir = ../../../doc/qtwidgets tagfile = ../../../doc/qtwidgets/qtwidgets.tags depends += qtcore qtgui diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index bff86c18dd..f294934269 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -9,7 +9,6 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused QMAKE_DOCS = $$PWD/doc/qtwidgets.qdocconf -QMAKE_DOCS_INDEX = ../../doc load(qt_module) |