diff options
author | Topi Reinio <topi.reinio@qt.io> | 2017-06-19 13:50:43 +0200 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@qt.io> | 2017-06-20 11:29:40 +0000 |
commit | bf37396d2b4541d08b4670f190736443c73a65e6 (patch) | |
tree | f873d49b31ec11a7f893a435651bba0f3f934909 | |
parent | 6179baf7ce0af0e7c86e9f837947db13f18c7ba2 (diff) |
Doc: Bump version to 5.9.1
Do this by making the main module version in .qmake.conf follow
the corresponding Qt for Device Creation versioning.
This allows $QT_VERSION et al. to be used in the doc configuration.
Make the full version visible in documentation, to help distinguish
between installed documentation sets with identical major/minor
versions but different patch version.
After this change, simply updating .qmake.conf is sufficient for
subsequent version increments.
Change-Id: Ib0a1ecb5a44d9f2530fa2df3b8daf7b3e541f884
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | src/doc/config/qtdeviceutilities-project.qdocconf | 13 | ||||
-rw-r--r-- | src/doc/src/qtdeviceutilities.qdoc | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/.qmake.conf b/.qmake.conf index a21d90c..0c87060 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION=2.0.0 +MODULE_VERSION=5.9.1 CMAKE_MODULE_TESTS=- diff --git a/src/doc/config/qtdeviceutilities-project.qdocconf b/src/doc/config/qtdeviceutilities-project.qdocconf index a7b03e1..d176779 100644 --- a/src/doc/config/qtdeviceutilities-project.qdocconf +++ b/src/doc/config/qtdeviceutilities-project.qdocconf @@ -1,6 +1,7 @@ project = QtDeviceUtilities -description = Qt Device Utilities -version = 5.9.0 +description = Qt Device Utilities $QT_VERSION +version = $QT_VERSION +macro.maintitle = "\\title Qt Device Utilities $QT_VERSION" sourcedirs += ../src \ ../../imports/localesettings \ @@ -29,14 +30,14 @@ indexes = $QT_INSTALL_DOCS/qtquick/qtquick.index \ qhp.projects = QtDeviceUtilities qhp.QtDeviceUtilities.file = qtdeviceutilities.qhp -qhp.QtDeviceUtilities.namespace = io.qt.qtdeviceutilities.590 +qhp.QtDeviceUtilities.namespace = io.qt.qtdeviceutilities.$QT_VERSION_TAG qhp.QtDeviceUtilities.virtualFolder = qtdeviceutilities -qhp.QtDeviceUtilities.indexTitle = Qt Device Utilities +qhp.QtDeviceUtilities.indexTitle = Qt Device Utilities $QT_VERSION qhp.QtDeviceUtilities.indexRoot = qhp.QtDeviceUtilities.subprojects = modules qhp.QtDeviceUtilities.subprojects.modules.title = Modules -qhp.QtDeviceUtilities.subprojects.modules.indexTitle = Qt Device Utilities +qhp.QtDeviceUtilities.subprojects.modules.indexTitle = Qt Device Utilities $QT_VERSION qhp.QtDeviceUtilities.subprojects.modules.selectors = qmlmodule module qhp.QtDeviceUtilities.subprojects.modules.sortPages = true @@ -48,7 +49,7 @@ macro.B2QL = "\\e {Boot to Qt for embedded Linux}" # Keep Device Creation as the landing page navigation.landingpage = "Qt for Device Creation" -navigation.qmltypespage = "Qt Device Utilities" +navigation.qmltypespage = "Qt Device Utilities $QT_VERSION" Cpp.ignoredirectives += Q_DECLARE_LOGGING_CATEGORY Cpp.ignoretokens += Q_DEL_EXPORT diff --git a/src/doc/src/qtdeviceutilities.qdoc b/src/doc/src/qtdeviceutilities.qdoc index 0f2cb7c..bce13a8 100644 --- a/src/doc/src/qtdeviceutilities.qdoc +++ b/src/doc/src/qtdeviceutilities.qdoc @@ -17,7 +17,7 @@ ****************************************************************************/ /*! \page qtee-module-reference.html - \title Qt Device Utilities + \maintitle The \B2Q stack in \SDK includes a number of additional modules that are useful for embedded applications. |