diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/config/installerfw-project.qdocconf | 2 | ||||
| -rw-r--r-- | doc/config/macros.qdocconf | 2 | ||||
| -rw-r--r-- | doc/doc.pri | 6 | ||||
| -rw-r--r-- | doc/installerfw.qdoc | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/doc/config/installerfw-project.qdocconf b/doc/config/installerfw-project.qdocconf index 841414df1..3b96a00af 100644 --- a/doc/config/installerfw-project.qdocconf +++ b/doc/config/installerfw-project.qdocconf @@ -17,7 +17,7 @@ sources.fileextensions = "*.qdoc" qhp.projects = InstallerFramework qhp.InstallerFramework.file = ifw.qhp -qhp.InstallerFramework.namespace = org.qt-project.ifw.121 +qhp.InstallerFramework.namespace = org.qt-project.ifw.$IFW_VERSION_TAG qhp.InstallerFramework.virtualFolder = doc qhp.InstallerFramework.indexTitle = Qt Installer Framework Manual qhp.InstallerFramework.filterAttributes = ifw diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf index 19960ea50..f8ce76899 100644 --- a/doc/config/macros.qdocconf +++ b/doc/config/macros.qdocconf @@ -39,3 +39,5 @@ macro.beginfloatright.HTML = "<div style=\"float: right; margin-left: 2em\">" macro.endfloat.HTML = "</div>" macro.clearfloat.HTML = "<br style=\"clear: both\" />" macro.emptyspan.HTML = "<span></span>" + +macro.ifwversion = $IFW_VERSION diff --git a/doc/doc.pri b/doc/doc.pri index 03bd125aa..30a0c4447 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -7,11 +7,13 @@ greaterThan(QT_MAJOR_VERSION, 4) { } win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\") +IFW_VERSION_TAG = $$replace(IFW_VERSION, "[-.]", ) + unix { - QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN + QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html IFW_VERSION=$$IFW_VERSION IFW_VERSION_TAG=$$IFW_VERSION_TAG $$QDOC_BIN HELPGENERATOR = $$[QT_INSTALL_BINS]/qhelpgenerator } else { - QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$QDOC_BIN + QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& set IFW_VERSION=$$IFW_VERSION&& setIFW_VERSION_TAG=$$IFW_VERSION_TAG&& $$QDOC_BIN # Always run qhelpgenerator inside its own cmd; this is a workaround for # an unusual bug which causes qhelpgenerator.exe to do nothing HELPGENERATOR = cmd /C $$replace($$list($$[QT_INSTALL_BINS]/qhelpgenerator.exe), "/", "\\") diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index 5950b0640..2c0836e59 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -38,7 +38,7 @@ \title Qt Installer Framework Manual - \section1 Version 1.2.1 + \section1 Version \ifwversion The Qt Installer Framework provides a set of tools and utilities to create installers for the supported desktop Qt platforms: Linux, Microsoft |