diff --git a/src/assistant/assistant/doc/qtassistant.qdocconf b/src/assistant/assistant/doc/qtassistant.qdocconf
index 3c2689e49254f276305750603a3627057cefbaab..74085713ca1de062eafaf9258611cf0abe44196b 100644
--- a/src/assistant/assistant/doc/qtassistant.qdocconf
+++ b/src/assistant/assistant/doc/qtassistant.qdocconf
@@ -7,11 +7,11 @@ url                     = http://qt-project.org/doc/qtassistant
 qhp.projects            = QtAssistant
 
 qhp.QtAssistant.file                = qtassistant.qhp
-qhp.QtAssistant.namespace           = org.qt-project.assistant.501
+qhp.QtAssistant.namespace           = org.qt-project.assistant.$QT_VERSION_TAG
 qhp.QtAssistant.virtualFolder       = assistant
 qhp.QtAssistant.indexTitle          = Qt Assistant Manual
 
-qhp.QtAssistant.filterAttributes    = qt 5.0.1 tools assistant
+qhp.QtAssistant.filterAttributes    = qt $QT_VERSION tools assistant
 qhp.QtAssistant.customFilters.QtAssistant.name = Qt Assistant Manual
 qhp.QtAssistant.customFilters.QtAssistant.filterAttributes = qt tools assistant
 qhp.QtAssistant.subprojects         = manual examples
diff --git a/src/assistant/help/doc/qthelp.qdocconf b/src/assistant/help/doc/qthelp.qdocconf
index b2072adc6b2d0523b822c22a6f07115cb3a1b084..20177af4852e6519d77d8e3fd5eba825f73a5a35 100644
--- a/src/assistant/help/doc/qthelp.qdocconf
+++ b/src/assistant/help/doc/qthelp.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = QtHelp
 description             = Qt Help Reference Documentation
 url                     = http://qt-project.org/doc/qthelp
-version                 = 5.0.1
+version                 = $QT_VERSION
 
 examplesinstallpath     = help
 
 qhp.projects            = QtHelp
 
 qhp.QtHelp.file                = qthelp.qhp
-qhp.QtHelp.namespace           = org.qt-project.qthelp.501
+qhp.QtHelp.namespace           = org.qt-project.qthelp.$QT_VERSION_TAG
 qhp.QtHelp.virtualFolder       = qthelp
 qhp.QtHelp.indexTitle          = Qt Help
 qhp.QtHelp.indexRoot           =
 
-qhp.QtHelp.filterAttributes    = qthelp 5.0.1 tools assistant qtrefdoc
-qhp.QtHelp.customFilters.QtHelp.name = QtHelp 5.0.1
-qhp.QtHelp.customFilters.QtHelp.filterAttributes = qthelp 5.0.1
+qhp.QtHelp.filterAttributes    = qthelp $QT_VERSION tools assistant qtrefdoc
+qhp.QtHelp.customFilters.QtHelp.name = QtHelp $QT_VERSION
+qhp.QtHelp.customFilters.QtHelp.filterAttributes = qthelp $QT_VERSION
 qhp.QtHelp.subprojects         = classes
 qhp.QtHelp.subprojects.classes.title = C++ Classes
 qhp.QtHelp.subprojects.classes.indexTitle = Qt Help C++ Classes
diff --git a/src/designer/src/designer/doc/qtdesigner.qdocconf b/src/designer/src/designer/doc/qtdesigner.qdocconf
index dc04cae4fbcf95b6fbf90b3463f4a680cf7433ad..decfde1d4932171efdd6b3bfa40bf7801f6da47e 100644
--- a/src/designer/src/designer/doc/qtdesigner.qdocconf
+++ b/src/designer/src/designer/doc/qtdesigner.qdocconf
@@ -7,11 +7,11 @@ url                     = http://qt-project.org/doc/qtdesigner
 qhp.projects            = QtDesigner
 
 qhp.QtDesigner.file                = qtdesigner.qhp
-qhp.QtDesigner.namespace           = org.qt-project.designer.501
+qhp.QtDesigner.namespace           = org.qt-project.designer.$QT_VERSION_TAG
 qhp.QtDesigner.virtualFolder       = qtdesigner
 qhp.QtDesigner.indexTitle          = Qt Designer Manual
 
-qhp.QtDesigner.filterAttributes    = qt 5.0.1 tools designer
+qhp.QtDesigner.filterAttributes    = qt $QT_VERSION tools designer
 qhp.QtDesigner.customFilters.QtDesigner.name = Qt Designer Manual
 qhp.QtDesigner.customFilters.QtDesigner.filterAttributes = qt tools designer
 qhp.QtDesigner.subprojects         = manual examples
diff --git a/src/designer/src/uitools/doc/qtuitools.qdocconf b/src/designer/src/uitools/doc/qtuitools.qdocconf
index 793847f19016a77611811514605b8c0b57c30e22..1c8bdeae03209290709b3b1b4d4382bc6eebd967 100644
--- a/src/designer/src/uitools/doc/qtuitools.qdocconf
+++ b/src/designer/src/uitools/doc/qtuitools.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = QtUiTools
 description             = Qt UI Tools Reference Documentation
 url                     = http://qt-project.org/doc/qtuitools
-version                 = 5.0.1
+version                 = $QT_VERSION
 
 examplesinstallpath     = uitools
 
 qhp.projects            = QtUiTools
 
 qhp.QtUiTools.file                = qtuitools.qhp
-qhp.QtUiTools.namespace           = org.qt-project.qtuitools.501
+qhp.QtUiTools.namespace           = org.qt-project.qtuitools.$QT_VERSION_TAG
 qhp.QtUiTools.virtualFolder       = qtuitools
 qhp.QtUiTools.indexTitle          = Qt UI Tools
 qhp.QtHelp.indexRoot           =
 
-qhp.QtUiTools.filterAttributes    = qtuitools 5.0.1 tools designer qtrefdoc
-qhp.QtUiTools.customFilters.QtUiTools.name = QtUiTools 5.0.1
-qhp.QtUiTools.customFilters.QtUiTools.filterAttributes = qtuitools 5.0.1
+qhp.QtUiTools.filterAttributes    = qtuitools $QT_VERSION tools designer qtrefdoc
+qhp.QtUiTools.customFilters.QtUiTools.name = QtUiTools $QT_VERSION
+qhp.QtUiTools.customFilters.QtUiTools.filterAttributes = qtuitools $QT_VERSION
 qhp.QtUiTools.subprojects         = classes
 qhp.QtUiTools.subprojects.classes.title = C++ Classes
 qhp.QtUiTools.subprojects.classes.indexTitle = Qt UI Tools C++ Classes
diff --git a/src/linguist/linguist/doc/qtlinguist.qdocconf b/src/linguist/linguist/doc/qtlinguist.qdocconf
index 6699f317381969d05f78886b1077b145b6b30484..6b2300ac0f0ba517d1ce53b6fe40950614d19223 100644
--- a/src/linguist/linguist/doc/qtlinguist.qdocconf
+++ b/src/linguist/linguist/doc/qtlinguist.qdocconf
@@ -7,11 +7,11 @@ url                     = http://qt-project.org/doc/qtlinguist
 qhp.projects            = QtLinguist
 
 qhp.QtLinguist.file                = qtlinguist.qhp
-qhp.QtLinguist.namespace           = org.qt-project.linguist.501
+qhp.QtLinguist.namespace           = org.qt-project.linguist.$QT_VERSION_TAG
 qhp.QtLinguist.virtualFolder       = qtlinguist
 qhp.QtLinguist.indexTitle          = Qt Linguist Manual
 
-qhp.QtLinguist.filterAttributes    = qt 5.0.1 tools qtlinguist
+qhp.QtLinguist.filterAttributes    = qt $QT_VERSION tools qtlinguist
 qhp.QtLinguist.customFilters.QtLinguist.name = Qt Linguist Manual
 qhp.QtLinguist.customFilters.QtLinguist.filterAttributes = qt tools qtlinguist
 qhp.QtLinguist.subprojects         = manual examples