substitute fixed version numbers in qdocconf files with variables

Change-Id: Ie57765c10a8e90d6fc74ee5a8fd84bfc7cd8bcf2
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

12 files changed, 54 insertions, 47 deletions

diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
index 99759c6da1..31f7b65c38 100644
--- a/mkspecs/features/qt_docs.prf
+++ b/mkspecs/features/qt_docs.prf
@@ -24,6 +24,13 @@ for(qmod, QMAKEMODULES): \
 QDOC += -outputdir $$QMAKE_DOCS_OUTPUTDIR
 !build_online_docs: \
     QDOC += -installdir $$[QT_INSTALL_DOCS]
+qtver.name = QT_VERSION
+qtver.value = $$QT_VERSION
+qtmver.name = QT_VER
+qtmver.value = $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}
+qtvertag.name = QT_VERSION_TAG
+qtvertag.value = $$replace(QT_VERSION, \.,)
+qtAddToolEnv(QDOC, qtver qtmver qtvertag)
 doc_command = $$QDOC $$QMAKE_DOCS
 prepare_docs {
     prepare_docs.commands += $$doc_command -prepare -no-link-errors
diff --git a/src/concurrent/doc/qtconcurrent.qdocconf b/src/concurrent/doc/qtconcurrent.qdocconf
index 442f69372c..1f5a0ec1f3 100644
--- a/src/concurrent/doc/qtconcurrent.qdocconf
+++ b/src/concurrent/doc/qtconcurrent.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = QtConcurrent
 description             = Qt Concurrent Reference Documentation
 url                     = http://qt-project.org/doc/qtconcurrent
-version                 = 5.0.1
+version                 = $QT_VERSION
 
 examplesinstallpath     = qtconcurrent
 
 qhp.projects            = QtConcurrent
 
 qhp.QtConcurrent.file         = qtconcurrent.qhp
-qhp.QtConcurrent.namespace           = org.qt-project.qtconcurrent.501
+qhp.QtConcurrent.namespace           = org.qt-project.qtconcurrent.$QT_VERSION_TAG
 qhp.QtConcurrent.virtualFolder       = qtconcurrent
 qhp.QtConcurrent.indexTitle          = Qt Concurrent
 qhp.QtConcurrent.indexRoot           =
 
-qhp.QtConcurrent.filterAttributes    = qtconcurrent 5.0.1 qtrefdoc
-qhp.QtConcurrent.customFilters.Qt.name = QtConcurrent 5.0.1
-qhp.QtConcurrent.customFilters.Qt.filterAttributes = qtconcurrent 5.0.1
+qhp.QtConcurrent.filterAttributes    = qtconcurrent $QT_VERSION qtrefdoc
+qhp.QtConcurrent.customFilters.Qt.name = QtConcurrent $QT_VERSION
+qhp.QtConcurrent.customFilters.Qt.filterAttributes = qtconcurrent $QT_VERSION
 
 qhp.QtConcurrent.subprojects         = classes
 qhp.QtConcurrent.subprojects.classes.title = C++ Classes
diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf
index cb87530f54..ac58bda07f 100644
--- a/src/corelib/doc/qtcore.qdocconf
+++ b/src/corelib/doc/qtcore.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = QtCore
 description             = Qt Core Reference Documentation
 url                     = http://qt-project.org/doc/qtcore
-version                 = 5.0.1
+version                 = $QT_VERSION
 
 examplesinstallpath     = core
 
 qhp.projects            = QtCore
 
 qhp.QtCore.file                = qtcore.qhp
-qhp.QtCore.namespace           = org.qt-project.qtcore.501
+qhp.QtCore.namespace           = org.qt-project.qtcore.$QT_VERSION_TAG
 qhp.QtCore.virtualFolder       = qtcore
 qhp.QtCore.indexTitle          = Qt Core
 qhp.QtCore.indexRoot           =
 
-qhp.QtCore.filterAttributes    = qtcore 5.0.1 qtrefdoc
-qhp.QtCore.customFilters.Qt.name = QtCore 5.0.1
-qhp.QtCore.customFilters.Qt.filterAttributes = qtcore 5.0.1
+qhp.QtCore.filterAttributes    = qtcore $QT_VERSION qtrefdoc
+qhp.QtCore.customFilters.Qt.name = QtCore $QT_VERSION
+qhp.QtCore.customFilters.Qt.filterAttributes = qtcore $QT_VERSION
 qhp.QtCore.subprojects         = classes
 qhp.QtCore.subprojects.classes.title = C++ Classes
 qhp.QtCore.subprojects.classes.indexTitle = Qt Core C++ Classes
diff --git a/src/dbus/doc/qtdbus.qdocconf b/src/dbus/doc/qtdbus.qdocconf
index 7a58dada63..f3b4c0f1d7 100644
--- a/src/dbus/doc/qtdbus.qdocconf
+++ b/src/dbus/doc/qtdbus.qdocconf
@@ -36,7 +36,7 @@ qhp.qtdbus.file = qtdbus.qhp
 
 # Namespace for the output file. This namespace is used to distinguish between
 # different documentation files in Creator/Assistant.
-qhp.qtdbus.namespace = org.qt-project.qtdbus.501
+qhp.qtdbus.namespace = org.qt-project.qtdbus.$QT_VERSION_TAG
 
 # Title for the package, will be the main title for the package in
 # Assistant/Creator.
diff --git a/src/gui/doc/qtgui.qdocconf b/src/gui/doc/qtgui.qdocconf
index a46aa9b3d1..3fc03aec73 100644
--- a/src/gui/doc/qtgui.qdocconf
+++ b/src/gui/doc/qtgui.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = QtGui
 description             = Qt GUI Reference Documentation
 url                     = http://qt-project.org/doc/qtgui
-version                 = 5.0.1
+version                 = $QT_VERSION
 
 examplesinstallpath     = gui
 
 qhp.projects            = QtGui
 
 qhp.QtGui.file         = qtgui.qhp
-qhp.QtGui.namespace           = org.qt-project.qtgui.501
+qhp.QtGui.namespace           = org.qt-project.qtgui.$QT_VERSION_TAG
 qhp.QtGui.virtualFolder       = qtgui
 qhp.QtGui.indexTitle          = Qt GUI
 qhp.QtGui.indexRoot           =
 
-qhp.QtGui.filterAttributes    = qtgui 5.0.1 qtrefdoc
-qhp.QtGui.customFilters.Qt.name = Qtgui 5.0.1
-qhp.QtGui.customFilters.Qt.filterAttributes = qtgui 5.0.1
+qhp.QtGui.filterAttributes    = qtgui $QT_VERSION qtrefdoc
+qhp.QtGui.customFilters.Qt.name = Qtgui $QT_VERSION
+qhp.QtGui.customFilters.Qt.filterAttributes = qtgui $QT_VERSION
 
 qhp.QtGui.subprojects         = classes
 qhp.QtGui.subprojects.classes.title = C++ Classes
diff --git a/src/network/doc/qtnetwork.qdocconf b/src/network/doc/qtnetwork.qdocconf
index 702338e224..59fb19fac9 100644
--- a/src/network/doc/qtnetwork.qdocconf
+++ b/src/network/doc/qtnetwork.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = QtNetwork
 description             = Qt Network Reference Documentation
 url                     = http://qt-project.org/doc/qtnetwork
-version                 = 5.0.1
+version                 = $QT_VERSION
 
 examplesinstallpath     = network
 
 qhp.projects            = QtNetwork
 
 qhp.QtNetwork.file         = qtnetwork.qhp
-qhp.QtNetwork.namespace           = org.qt-project.qtnetwork.501
+qhp.QtNetwork.namespace           = org.qt-project.qtnetwork.$QT_VERSION_TAG
 qhp.QtNetwork.virtualFolder       = qtnetwork
 qhp.QtNetwork.indexTitle          = Qt Network
 qhp.QtNetwork.indexRoot           =
 
-qhp.QtNetwork.filterAttributes    = qtnetwork 5.0.1 qtrefdoc
-qhp.QtNetwork.customFilters.Qt.name = QtNetwork 5.0.1
-qhp.QtNetwork.customFilters.Qt.filterAttributes = qtnetwork 5.0.1
+qhp.QtNetwork.filterAttributes    = qtnetwork $QT_VERSION qtrefdoc
+qhp.QtNetwork.customFilters.Qt.name = QtNetwork $QT_VERSION
+qhp.QtNetwork.customFilters.Qt.filterAttributes = qtnetwork $QT_VERSION
 
 qhp.QtNetwork.subprojects         = classes
 qhp.QtNetwork.subprojects.classes.title = C++ Classes
diff --git a/src/opengl/doc/qtopengl.qdocconf b/src/opengl/doc/qtopengl.qdocconf
index 131fdb8968..d0f49fd602 100644
--- a/src/opengl/doc/qtopengl.qdocconf
+++ b/src/opengl/doc/qtopengl.qdocconf
@@ -39,7 +39,7 @@ qhp.qtopengl.file = qtopengl.qhp
 
 # Namespace for the output file. This namespace is used to distinguish between
 # different documentation files in Creator/Assistant.
-qhp.qtopengl.namespace = org.qt-project.qtopengl.501
+qhp.qtopengl.namespace = org.qt-project.qtopengl.$QT_VERSION_TAG
 
 # Title for the package, will be the main title for the package in
 # Assistant/Creator.
diff --git a/src/printsupport/doc/qtprintsupport.qdocconf b/src/printsupport/doc/qtprintsupport.qdocconf
index 1a4d37ae49..60b6b8fa52 100644
--- a/src/printsupport/doc/qtprintsupport.qdocconf
+++ b/src/printsupport/doc/qtprintsupport.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = QtPrintSupport
 description             = Qt Print Support Reference Documentation
 url                     = http://qt-project.org/doc/qtprintsupport
-version                 = 5.0.1
+version                 = $QT_VERSION
 
 examplesinstallpath     = printsupport
 
 qhp.projects            = QtPrintSupport
 
 qhp.QtPrintSupport.file         = qtprintsupport.qhp
-qhp.QtPrintSupport.namespace           = org.qt-project.qtprintsupport.501
+qhp.QtPrintSupport.namespace           = org.qt-project.qtprintsupport.$QT_VERSION_TAG
 qhp.QtPrintSupport.virtualFolder       = qtprintsupport
 qhp.QtPrintSupport.indexTitle          = Qt Print Support
 qhp.QtPrintSupport.indexRoot           =
 
-qhp.QtPrintSupport.filterAttributes    = qtprintsupport 5.0.1 qtrefdoc
-qhp.QtPrintSupport.customFilters.Qt.name = QtPrintSupport 5.0.1
-qhp.QtPrintSupport.customFilters.Qt.filterAttributes = qtprintsupport 5.0.1
+qhp.QtPrintSupport.filterAttributes    = qtprintsupport $QT_VERSION qtrefdoc
+qhp.QtPrintSupport.customFilters.Qt.name = QtPrintSupport $QT_VERSION
+qhp.QtPrintSupport.customFilters.Qt.filterAttributes = qtprintsupport $QT_VERSION
 
 qhp.QtPrintSupport.subprojects         = classes
 qhp.QtPrintSupport.subprojects.classes.title = C++ Classes
diff --git a/src/sql/doc/qtsql.qdocconf b/src/sql/doc/qtsql.qdocconf
index 6c5af37de8..2fedc1b561 100644
--- a/src/sql/doc/qtsql.qdocconf
+++ b/src/sql/doc/qtsql.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = QtSql
 description             = Qt SQL Reference Documentation
 url                     = http://qt-project.org/doc/qtsql
-version                 = 5.0.1
+version                 = $QT_VERSION
 
 examplesinstallpath     = sql
 
 qhp.projects            = QtSql
 
 qhp.QtSql.file            = qtsql.qhp
-qhp.QtSql.namespace           = org.qt-project.qtsql.501
+qhp.QtSql.namespace           = org.qt-project.qtsql.$QT_VERSION_TAG
 qhp.QtSql.virtualFolder       = qtsql
 qhp.QtSql.indexTitle          = Qt SQL
 qhp.QtSql.indexRoot           =
 
-qhp.QtSql.filterAttributes    = qtsql 5.0.1 qtrefdoc
-qhp.QtSql.customFilters.Qt.name = QtSql 5.0.1
-qhp.QtSql.customFilters.Qt.filterAttributes = qtsql 5.0.1
+qhp.QtSql.filterAttributes    = qtsql $QT_VERSION qtrefdoc
+qhp.QtSql.customFilters.Qt.name = QtSql $QT_VERSION
+qhp.QtSql.customFilters.Qt.filterAttributes = qtsql $QT_VERSION
 
 qhp.QtSql.subprojects         = classes
 qhp.QtSql.subprojects.classes.title = C++ Classes
diff --git a/src/testlib/doc/qttestlib.qdocconf b/src/testlib/doc/qttestlib.qdocconf
index 3785bd6503..fe39ddc692 100644
--- a/src/testlib/doc/qttestlib.qdocconf
+++ b/src/testlib/doc/qttestlib.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = QtTestLib
 description             = Qt Test Reference Documentation
 url                     = http://qt-project.org/doc/qttestlib
-version                 = 5.0.1
+version                 = $QT_VERSION
 
 examplesinstallpath     = testlib
 
 qhp.projects            = QtTestLib
 
 qhp.QtTestLib.file                = qttestlib.qhp
-qhp.QtTestLib.namespace           = org.qt-project.qttest.501
+qhp.QtTestLib.namespace           = org.qt-project.qttest.$QT_VERSION_TAG
 qhp.QtTestLib.virtualFolder       = qttest
 qhp.QtTestLib.indexTitle          = Qt Test
 qhp.QtTestLib.indexRoot           =
 
-qhp.QtTestLib.filterAttributes    = qttest 5.0.1 qtrefdoc
-qhp.QtTestLib.customFilters.Qt.name = QtTest 5.0.1
-qhp.QtTestLib.customFilters.Qt.filterAttributes = qttest 5.0.1
+qhp.QtTestLib.filterAttributes    = qttest $QT_VERSION qtrefdoc
+qhp.QtTestLib.customFilters.Qt.name = QtTest $QT_VERSION
+qhp.QtTestLib.customFilters.Qt.filterAttributes = qttest $QT_VERSION
 
 qhp.QtTestLib.subprojects         = classes
 qhp.QtTestLib.subprojects.classes.title = C++ Classes
diff --git a/src/widgets/doc/qtwidgets.qdocconf b/src/widgets/doc/qtwidgets.qdocconf
index 062adc7f7c..4ce7c38357 100644
--- a/src/widgets/doc/qtwidgets.qdocconf
+++ b/src/widgets/doc/qtwidgets.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = QtWidgets
 description             = Qt Widgets Reference Documentation
 url                     = http://qt-project.org/doc/qtwidgets
-version                 = 5.0.1
+version                 = $QT_VERSION
 
 examplesinstallpath     = widgets
 
 qhp.projects            = QtWidgets
 
 qhp.QtWidgets.file         = qtwidgets.qhp
-qhp.QtWidgets.namespace           = org.qt-project.qtwidgets.501
+qhp.QtWidgets.namespace           = org.qt-project.qtwidgets.$QT_VERSION_TAG
 qhp.QtWidgets.virtualFolder       = qtwidgets
 qhp.QtWidgets.indexTitle          = Qt Widgets
 qhp.QtWidgets.indexRoot           =
 
-qhp.QtWidgets.filterAttributes    = qtwidgets 5.0.1 qtrefdoc
-qhp.QtWidgets.customFilters.Qt.name = QtWidgets 5.0.1
-qhp.QtWidgets.customFilters.Qt.filterAttributes = qtwidgets 5.0.1
+qhp.QtWidgets.filterAttributes    = qtwidgets $QT_VERSION qtrefdoc
+qhp.QtWidgets.customFilters.Qt.name = QtWidgets $QT_VERSION
+qhp.QtWidgets.customFilters.Qt.filterAttributes = qtwidgets $QT_VERSION
 
 qhp.QtWidgets.subprojects         = classes
 qhp.QtWidgets.subprojects.classes.title = C++ Classes
diff --git a/src/xml/doc/qtxml.qdocconf b/src/xml/doc/qtxml.qdocconf
index bf77059a02..c713a61695 100644
--- a/src/xml/doc/qtxml.qdocconf
+++ b/src/xml/doc/qtxml.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = QtXml
 description             = Qt XML Reference Documentation
 url                     = http://qt-project.org/doc/qtxml
-version                 = 5.0.1
+version                 = $QT_VERSION
 
 examplesinstallpath     = xml
 
 qhp.projects            = QtXml
 
 qhp.QtXml.file            = qtxml.qhp
-qhp.QtXml.namespace           = org.qt-project.qtxml.501
+qhp.QtXml.namespace           = org.qt-project.qtxml.$QT_VERSION_TAG
 qhp.QtXml.virtualFolder       = qtxml
 qhp.QtXml.indexTitle          = Qt XML
 qhp.QtXml.indexRoot           =
 
-qhp.QtXml.filterAttributes    = qtxml 5.0.1 qtrefdoc
-qhp.QtXml.customFilters.Qt.name = QtXml 5.0.1
-qhp.QtXml.customFilters.Qt.filterAttributes = qtxml 5.0.1
+qhp.QtXml.filterAttributes    = qtxml $QT_VERSION qtrefdoc
+qhp.QtXml.customFilters.Qt.name = QtXml $QT_VERSION
+qhp.QtXml.customFilters.Qt.filterAttributes = qtxml $QT_VERSION
 
 qhp.QtXml.subprojects         = classes
 qhp.QtXml.subprojects.classes.title = C++ Classes