Commit 5a17c4ca authored by Topi Reinio's avatar Topi Reinio Committed by Jani Heikkinen
Browse files

Doc: Fix version strings in documentation configuration


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: default avatarMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@theqtcompany.com>
parent c00f1090
No related merge requests found
Showing with 6 additions and 6 deletions
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtCanvas3D project = QtCanvas3D
description = QtCanvas3D Reference Documentation description = Qt Canvas 3D Reference Documentation
version = 1.1.0 version = $QT_VERSION
exampledirs = ../../../../examples/canvas3d \ exampledirs = ../../../../examples/canvas3d \
snippets snippets
...@@ -18,15 +18,15 @@ depends = qtcore qtgui qtqml qtquick qtquickcontrols qtquicklayouts qtdoc qt ...@@ -18,15 +18,15 @@ depends = qtcore qtgui qtqml qtquick qtquickcontrols qtquicklayouts qtdoc qt
qhp.projects = QtCanvas3D qhp.projects = QtCanvas3D
qhp.QtCanvas3D.file = qtcanvas3d.qhp 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.virtualFolder = qtcanvas3d
qhp.QtCanvas3D.indexTitle = Qt Canvas 3D qhp.QtCanvas3D.indexTitle = Qt Canvas 3D
qhp.QtCanvas3D.indexRoot = qhp.QtCanvas3D.indexRoot =
qhp.QtCanvas3D.filterAttributes = qtcanvas3d 1.1.0 qtrefdoc qhp.QtCanvas3D.filterAttributes = qtcanvas3d $QT_VERSION qtrefdoc
qhp.QtCanvas3D.customFilters.Qt.name = QtCanvas3D 1.1.0 qhp.QtCanvas3D.customFilters.Qt.name = QtCanvas3D $QT_VERSION
qhp.QtCanvas3D.customFilters.Qt.filterAttributes = qtcanvas3d 1.1.0 qhp.QtCanvas3D.customFilters.Qt.filterAttributes = qtcanvas3d $QT_VERSION
qhp.QtCanvas3D.subprojects = gettingstarted examples types qhp.QtCanvas3D.subprojects = gettingstarted examples types
qhp.QtCanvas3D.subprojects.gettingstarted.title = Getting Started qhp.QtCanvas3D.subprojects.gettingstarted.title = Getting Started
qhp.QtCanvas3D.subprojects.gettingstarted.indexTitle = Qt Canvas 3D Getting Started qhp.QtCanvas3D.subprojects.gettingstarted.indexTitle = Qt Canvas 3D Getting Started
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment