diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/doc.pri | 6 | ||||
-rw-r--r-- | doc/qbs-qt4.qdocconf | 2 | ||||
-rw-r--r-- | doc/qbs.qdocconf | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 8b871ee11..33c34a3dd 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -4,8 +4,10 @@ defineReplace(targetPath) { qt:greaterThan(QT_MAJOR_VERSION, 4) { QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc) + QDOC_MAINFILE = $$PWD/qbs.qdocconf } else { QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3) + QDOC_MAINFILE = $$PWD/qbs-qt4.qdocconf # cheap replacement of the Qt5 shell_quote function defineReplace(shell_quote) { @@ -39,9 +41,9 @@ HELP_DEP_FILES = $$PWD/qbs.qdoc \ $$PWD/config/qt-cpp-ignore.qdocconf \ $$PWD/config/qt-html-templates.qdocconf \ $$PWD/config/qt-html-default-styles.qdocconf \ - $$PWD/qbs.qdocconf + $$QDOC_MAINFILE -html_docs.commands = $$QDOC $$PWD/qbs.qdocconf +html_docs.commands = $$QDOC $$QDOC_MAINFILE html_docs.depends += $$HELP_DEP_FILES html_docs.files = $$QHP_FILE diff --git a/doc/qbs-qt4.qdocconf b/doc/qbs-qt4.qdocconf new file mode 100644 index 000000000..f67a8a41f --- /dev/null +++ b/doc/qbs-qt4.qdocconf @@ -0,0 +1,2 @@ +include(config/qbs-project.qdocconf) +include(config/qt-html-templates.qdocconf) diff --git a/doc/qbs.qdocconf b/doc/qbs.qdocconf index 516d4e796..9a1b2f6ab 100644 --- a/doc/qbs.qdocconf +++ b/doc/qbs.qdocconf @@ -1,3 +1,2 @@ -# Run qdoc from the directory that contains this file. include(config/qbs-project.qdocconf) -include(config/qt-html-templates.qdocconf) +include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) |