diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-02-19 12:32:24 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-02-19 15:06:27 +0100 |
commit | 42f4ee54b70bc6a8148a4e91e5607d067761aa46 (patch) | |
tree | b0407b0c5964693b4bb393e70931681fddbf0150 /doc/doc.pri | |
parent | 3953cbc176f633cc7de0118dc1dbf6275d492702 (diff) |
fix documentation for Qt5
Still working with Qt4.
Change-Id: I09eea41013d63342f2f5d32c41174a9c00eb3e03
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Diffstat (limited to 'doc/doc.pri')
-rw-r--r-- | doc/doc.pri | 6 |
1 files changed, 4 insertions, 2 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 |