aboutsummaryrefslogtreecommitdiffstats
path: root/doc/doc.pri
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-12-17 20:21:27 +0100
committerhjk <qtc-committer@nokia.com>2011-02-11 08:40:55 +0100
commita20cd348633861b91ed30d6a9319e096651a5de1 (patch)
tree5c970196c138aa60b86842848c3ea9297bf4a1c6 /doc/doc.pri
parenta89bac3c3c52665ecb2b14a7837f40c0ca6b7f0c (diff)
Updated the configuration files to use the updated qdoc.
Updated qdoc to remove hard-coded dependencies on style sheets. Simplified the offline documentation, introducing an offline.css file to be used for documentation in Qt Creator.
Diffstat (limited to 'doc/doc.pri')
-rw-r--r--doc/doc.pri12
1 files changed, 8 insertions, 4 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
index 605ae9192b..15d623375a 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -21,15 +21,19 @@ QCH_FILE = $$IDE_DOC_PATH/qtcreator.qch
HELP_DEP_FILES = $$PWD/qtcreator.qdoc \
$$PWD/addressbook-sdk.qdoc \
- $$PWD/qt-defines.qdocconf \
- $$PWD/qt-html-templates.qdocconf \
+ $$PWD/config/compat.qdocconf \
+ $$PWD/config/macros.qdocconf \
+ $$PWD/config/qt-cpp-ignore.qdocconf \
+ $$PWD/config/qt-defines.qdocconf \
+ $$PWD/config/qt-html-templates.qdocconf \
+ $$PWD/config/qt-html-default-styles.qdocconf \
$$PWD/qtcreator.qdocconf
-html_docs.commands = $$QDOC -creator $$PWD/qtcreator.qdocconf
+html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf
html_docs.depends += $$HELP_DEP_FILES
html_docs.files = $$QHP_FILE
-html_docs_online.commands = $$QDOC -online $$PWD/qtcreator.qdocconf
+html_docs_online.commands = $$QDOC $$PWD/qtcreator-online.qdocconf
html_docs_online.depends += $$HELP_DEP_FILES
qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE