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>
This commit is contained in:
Tor Arne Vestbø
2012-10-11 15:23:49 +02:00
committed by The Qt Project
parent cb010ebf5c
commit c64d7ce2a2
7 changed files with 5 additions and 801 deletions

View File

@@ -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"

View File

@@ -1,47 +0,0 @@
win32:!win32-g++ {
unixstyle = false
} else:win32-g++:isEmpty(QMAKE_SH) {
unixstyle = false
} else {
unixstyle = true
}
qtPrepareTool(QDOC, qdoc)
isEmpty(QDOC): warning("No qdoc executable found.")
ONLINE_CONF = $$PWD/qtmultimedia.qdocconf
DITA_CONF = $$PWD/qtmultimedia-dita.qdocconf
QCH_CONF = #nothing yet
$$unixstyle {
} else {
QDOC = $$replace(QDOC, "qdoc", "qdoc3.exe")
ONLINE_CONF = $$replace(ONLINE_CONF, "/", "\\")
DITA_DOCS = $$replace(ONLINE_CONF, "/", "\\")
}
# Build rules
docs.depends = dita_docs online_docs qch_docs
online_docs.commands = $$QDOC $$ONLINE_CONF
dita_docs.commands = $$QDOC $$DITA_CONF
qch_docs.commands = #no commands yet
QMAKE_EXTRA_TARGETS += docs dita_docs online_docs qch_docs
QMAKE_CLEAN += \
"-r $$PWD/../html" \
"-r $$PWD/../ditaxml"
OTHER_FILES += \
doc/src/cameraoverview.qdoc \
doc/src/changes.qdoc \
doc/src/multimediabackend.qdoc \
doc/src/multimedia.qdoc \
doc/src/audiooverview.qdoc \
doc/src/radiooverview.qdoc \
doc/src/videooverview.qdoc \
doc/src/plugins/qml-multimedia.qdoc

View File

@@ -6,6 +6,8 @@ contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
DEFINES += QT_NO_OPENGL
}
QMAKE_DOCS = $$PWD/doc/qtmultimedia.qdocconf
load(qt_module)
INCLUDEPATH *= .