diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-11 15:23:49 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-11 15:47:53 +0200 |
commit | c64d7ce2a27e449dd7d0095b62ecc4f9495604e3 (patch) | |
tree | 01447f64db5f7fd1ed5834c696f656c81488352e /src/multimedia/doc/qtmultimedia.qdocconf | |
parent | cb010ebf5cea10fdc7b9c5158a0f843664faf735 (diff) |
Update docs after modularization of docs
The global files now live in qtbase only, and are made available to the
other modules via the $QT_INSTALL_DOCS variable.
We now use QMAKE_DOCS to trigger doc generation instead of rolling our
own rules for qdoc.
Change-Id: I900029d71c305a1f269cddeeb0e05c524d933834
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/multimedia/doc/qtmultimedia.qdocconf')
-rw-r--r-- | src/multimedia/doc/qtmultimedia.qdocconf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf index a991df6a0..44b0105a4 100644 --- a/src/multimedia/doc/qtmultimedia.qdocconf +++ b/src/multimedia/doc/qtmultimedia.qdocconf @@ -1,3 +1,6 @@ +include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) + include(compat.qdocconf) include(macros.qdocconf) include(qt-cpp-ignore.qdocconf) @@ -64,7 +67,6 @@ qhp.qtmultimedia.subprojects.classes.sortPages = true # Do NOT change the variables after this line unless you know what you are doing. -outputdir = html outputformats = HTML examples.fileextensions = "*.cpp *.h *.js *.svg *.xml *.ui *.qml" |