diff options
| author | Topi Reinio <topi.reinio@theqtcompany.com> | 2016-02-11 15:12:42 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2016-02-12 05:54:13 +0000 |
| commit | 5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18 (patch) | |
| tree | 4f39bf39d85ff51d8cd12401a670ebdb4403b822 | |
| parent | c00f1090b2287d345e83699d6b414336227aaf91 (diff) | |
Doc: Fix version strings in documentation configurationv5.6.0-rc1v5.6.0
Old version strings caused a conflict in documentation namespaces,
resulting in wrong version of docs to be referenced for users that
have multiple versions installed.
Change-Id: I3386c2fb225e820b6251f067b9fb961b0879d28b
Task-number: QTBUG-51051
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| -rw-r--r-- | src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf b/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf index be8e805..c0a7ae4 100644 --- a/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf +++ b/src/imports/qtcanvas3d/doc/qtcanvas3d.qdocconf @@ -1,8 +1,8 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtCanvas3D -description = QtCanvas3D Reference Documentation -version = 1.1.0 +description = Qt Canvas 3D Reference Documentation +version = $QT_VERSION exampledirs = ../../../../examples/canvas3d \ snippets @@ -18,15 +18,15 @@ depends = qtcore qtgui qtqml qtquick qtquickcontrols qtquicklayouts qtdoc qt qhp.projects = QtCanvas3D qhp.QtCanvas3D.file = qtcanvas3d.qhp -qhp.QtCanvas3D.namespace = org.qt-project.qtcanvas3d.100 +qhp.QtCanvas3D.namespace = org.qt-project.qtcanvas3d.$QT_VERSION_TAG qhp.QtCanvas3D.virtualFolder = qtcanvas3d qhp.QtCanvas3D.indexTitle = Qt Canvas 3D qhp.QtCanvas3D.indexRoot = -qhp.QtCanvas3D.filterAttributes = qtcanvas3d 1.1.0 qtrefdoc -qhp.QtCanvas3D.customFilters.Qt.name = QtCanvas3D 1.1.0 -qhp.QtCanvas3D.customFilters.Qt.filterAttributes = qtcanvas3d 1.1.0 +qhp.QtCanvas3D.filterAttributes = qtcanvas3d $QT_VERSION qtrefdoc +qhp.QtCanvas3D.customFilters.Qt.name = QtCanvas3D $QT_VERSION +qhp.QtCanvas3D.customFilters.Qt.filterAttributes = qtcanvas3d $QT_VERSION qhp.QtCanvas3D.subprojects = gettingstarted examples types qhp.QtCanvas3D.subprojects.gettingstarted.title = Getting Started qhp.QtCanvas3D.subprojects.gettingstarted.indexTitle = Qt Canvas 3D Getting Started |