diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-02-13 11:00:08 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2013-02-14 13:11:40 +0100 |
| commit | 930a088c78078dd5daf2b3bcd559026f49d0dd96 (patch) | |
| tree | 73f24716673af3f2e7e348118e61787500c888d8 | |
| parent | dd32cc3b0893d1ccfbc3de397c23a9d5bef9832e (diff) | |
Don't hard-code version in documentation
Change-Id: Ib96057aa5103a80cbaacc27fe2330d481da70399
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| -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 | ||||
| -rw-r--r-- | installerfw.pri | 3 | ||||
| -rw-r--r-- | installerfw.pro | 1 |
6 files changed, 12 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 diff --git a/installerfw.pri b/installerfw.pri index 63a0b3825..18224ea49 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -2,6 +2,9 @@ error("installerfw.pri already included") } IFW_PRI_INCLUDED = 1 + +IFW_VERSION = 1.2.81 + IFW_NEWLINE = $$escape_expand(\\n\\t) defineReplace(toNativeSeparators) { diff --git a/installerfw.pro b/installerfw.pro index 356dd2e42..2f0b653d7 100644 --- a/installerfw.pro +++ b/installerfw.pro @@ -2,4 +2,5 @@ CONFIG += ordered TEMPLATE = subdirs SUBDIRS += src examples tests tools +include (installerfw.pri) include (doc/doc.pri) |