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>
This commit is contained in:
parent
c81d15a746
commit
06a6d1da58
@ -24,6 +24,13 @@ for(qmod, QMAKEMODULES): \
|
|||||||
QDOC += -outputdir $$QMAKE_DOCS_OUTPUTDIR
|
QDOC += -outputdir $$QMAKE_DOCS_OUTPUTDIR
|
||||||
!build_online_docs: \
|
!build_online_docs: \
|
||||||
QDOC += -installdir $$[QT_INSTALL_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
|
doc_command = $$QDOC $$QMAKE_DOCS
|
||||||
prepare_docs {
|
prepare_docs {
|
||||||
prepare_docs.commands += $$doc_command -prepare -no-link-errors
|
prepare_docs.commands += $$doc_command -prepare -no-link-errors
|
||||||
|
@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
|
|||||||
project = QtConcurrent
|
project = QtConcurrent
|
||||||
description = Qt Concurrent Reference Documentation
|
description = Qt Concurrent Reference Documentation
|
||||||
url = http://qt-project.org/doc/qtconcurrent
|
url = http://qt-project.org/doc/qtconcurrent
|
||||||
version = 5.0.1
|
version = $QT_VERSION
|
||||||
|
|
||||||
examplesinstallpath = qtconcurrent
|
examplesinstallpath = qtconcurrent
|
||||||
|
|
||||||
qhp.projects = QtConcurrent
|
qhp.projects = QtConcurrent
|
||||||
|
|
||||||
qhp.QtConcurrent.file = qtconcurrent.qhp
|
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.virtualFolder = qtconcurrent
|
||||||
qhp.QtConcurrent.indexTitle = Qt Concurrent
|
qhp.QtConcurrent.indexTitle = Qt Concurrent
|
||||||
qhp.QtConcurrent.indexRoot =
|
qhp.QtConcurrent.indexRoot =
|
||||||
|
|
||||||
qhp.QtConcurrent.filterAttributes = qtconcurrent 5.0.1 qtrefdoc
|
qhp.QtConcurrent.filterAttributes = qtconcurrent $QT_VERSION qtrefdoc
|
||||||
qhp.QtConcurrent.customFilters.Qt.name = QtConcurrent 5.0.1
|
qhp.QtConcurrent.customFilters.Qt.name = QtConcurrent $QT_VERSION
|
||||||
qhp.QtConcurrent.customFilters.Qt.filterAttributes = qtconcurrent 5.0.1
|
qhp.QtConcurrent.customFilters.Qt.filterAttributes = qtconcurrent $QT_VERSION
|
||||||
|
|
||||||
qhp.QtConcurrent.subprojects = classes
|
qhp.QtConcurrent.subprojects = classes
|
||||||
qhp.QtConcurrent.subprojects.classes.title = C++ Classes
|
qhp.QtConcurrent.subprojects.classes.title = C++ Classes
|
||||||
|
@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
|
|||||||
project = QtCore
|
project = QtCore
|
||||||
description = Qt Core Reference Documentation
|
description = Qt Core Reference Documentation
|
||||||
url = http://qt-project.org/doc/qtcore
|
url = http://qt-project.org/doc/qtcore
|
||||||
version = 5.0.1
|
version = $QT_VERSION
|
||||||
|
|
||||||
examplesinstallpath = core
|
examplesinstallpath = core
|
||||||
|
|
||||||
qhp.projects = QtCore
|
qhp.projects = QtCore
|
||||||
|
|
||||||
qhp.QtCore.file = qtcore.qhp
|
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.virtualFolder = qtcore
|
||||||
qhp.QtCore.indexTitle = Qt Core
|
qhp.QtCore.indexTitle = Qt Core
|
||||||
qhp.QtCore.indexRoot =
|
qhp.QtCore.indexRoot =
|
||||||
|
|
||||||
qhp.QtCore.filterAttributes = qtcore 5.0.1 qtrefdoc
|
qhp.QtCore.filterAttributes = qtcore $QT_VERSION qtrefdoc
|
||||||
qhp.QtCore.customFilters.Qt.name = QtCore 5.0.1
|
qhp.QtCore.customFilters.Qt.name = QtCore $QT_VERSION
|
||||||
qhp.QtCore.customFilters.Qt.filterAttributes = qtcore 5.0.1
|
qhp.QtCore.customFilters.Qt.filterAttributes = qtcore $QT_VERSION
|
||||||
qhp.QtCore.subprojects = classes
|
qhp.QtCore.subprojects = classes
|
||||||
qhp.QtCore.subprojects.classes.title = C++ Classes
|
qhp.QtCore.subprojects.classes.title = C++ Classes
|
||||||
qhp.QtCore.subprojects.classes.indexTitle = Qt Core C++ Classes
|
qhp.QtCore.subprojects.classes.indexTitle = Qt Core C++ Classes
|
||||||
|
@ -36,7 +36,7 @@ qhp.qtdbus.file = qtdbus.qhp
|
|||||||
|
|
||||||
# Namespace for the output file. This namespace is used to distinguish between
|
# Namespace for the output file. This namespace is used to distinguish between
|
||||||
# different documentation files in Creator/Assistant.
|
# 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
|
# Title for the package, will be the main title for the package in
|
||||||
# Assistant/Creator.
|
# Assistant/Creator.
|
||||||
|
@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
|
|||||||
project = QtGui
|
project = QtGui
|
||||||
description = Qt GUI Reference Documentation
|
description = Qt GUI Reference Documentation
|
||||||
url = http://qt-project.org/doc/qtgui
|
url = http://qt-project.org/doc/qtgui
|
||||||
version = 5.0.1
|
version = $QT_VERSION
|
||||||
|
|
||||||
examplesinstallpath = gui
|
examplesinstallpath = gui
|
||||||
|
|
||||||
qhp.projects = QtGui
|
qhp.projects = QtGui
|
||||||
|
|
||||||
qhp.QtGui.file = qtgui.qhp
|
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.virtualFolder = qtgui
|
||||||
qhp.QtGui.indexTitle = Qt GUI
|
qhp.QtGui.indexTitle = Qt GUI
|
||||||
qhp.QtGui.indexRoot =
|
qhp.QtGui.indexRoot =
|
||||||
|
|
||||||
qhp.QtGui.filterAttributes = qtgui 5.0.1 qtrefdoc
|
qhp.QtGui.filterAttributes = qtgui $QT_VERSION qtrefdoc
|
||||||
qhp.QtGui.customFilters.Qt.name = Qtgui 5.0.1
|
qhp.QtGui.customFilters.Qt.name = Qtgui $QT_VERSION
|
||||||
qhp.QtGui.customFilters.Qt.filterAttributes = qtgui 5.0.1
|
qhp.QtGui.customFilters.Qt.filterAttributes = qtgui $QT_VERSION
|
||||||
|
|
||||||
qhp.QtGui.subprojects = classes
|
qhp.QtGui.subprojects = classes
|
||||||
qhp.QtGui.subprojects.classes.title = C++ Classes
|
qhp.QtGui.subprojects.classes.title = C++ Classes
|
||||||
|
@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
|
|||||||
project = QtNetwork
|
project = QtNetwork
|
||||||
description = Qt Network Reference Documentation
|
description = Qt Network Reference Documentation
|
||||||
url = http://qt-project.org/doc/qtnetwork
|
url = http://qt-project.org/doc/qtnetwork
|
||||||
version = 5.0.1
|
version = $QT_VERSION
|
||||||
|
|
||||||
examplesinstallpath = network
|
examplesinstallpath = network
|
||||||
|
|
||||||
qhp.projects = QtNetwork
|
qhp.projects = QtNetwork
|
||||||
|
|
||||||
qhp.QtNetwork.file = qtnetwork.qhp
|
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.virtualFolder = qtnetwork
|
||||||
qhp.QtNetwork.indexTitle = Qt Network
|
qhp.QtNetwork.indexTitle = Qt Network
|
||||||
qhp.QtNetwork.indexRoot =
|
qhp.QtNetwork.indexRoot =
|
||||||
|
|
||||||
qhp.QtNetwork.filterAttributes = qtnetwork 5.0.1 qtrefdoc
|
qhp.QtNetwork.filterAttributes = qtnetwork $QT_VERSION qtrefdoc
|
||||||
qhp.QtNetwork.customFilters.Qt.name = QtNetwork 5.0.1
|
qhp.QtNetwork.customFilters.Qt.name = QtNetwork $QT_VERSION
|
||||||
qhp.QtNetwork.customFilters.Qt.filterAttributes = qtnetwork 5.0.1
|
qhp.QtNetwork.customFilters.Qt.filterAttributes = qtnetwork $QT_VERSION
|
||||||
|
|
||||||
qhp.QtNetwork.subprojects = classes
|
qhp.QtNetwork.subprojects = classes
|
||||||
qhp.QtNetwork.subprojects.classes.title = C++ Classes
|
qhp.QtNetwork.subprojects.classes.title = C++ Classes
|
||||||
|
@ -39,7 +39,7 @@ qhp.qtopengl.file = qtopengl.qhp
|
|||||||
|
|
||||||
# Namespace for the output file. This namespace is used to distinguish between
|
# Namespace for the output file. This namespace is used to distinguish between
|
||||||
# different documentation files in Creator/Assistant.
|
# 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
|
# Title for the package, will be the main title for the package in
|
||||||
# Assistant/Creator.
|
# Assistant/Creator.
|
||||||
|
@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
|
|||||||
project = QtPrintSupport
|
project = QtPrintSupport
|
||||||
description = Qt Print Support Reference Documentation
|
description = Qt Print Support Reference Documentation
|
||||||
url = http://qt-project.org/doc/qtprintsupport
|
url = http://qt-project.org/doc/qtprintsupport
|
||||||
version = 5.0.1
|
version = $QT_VERSION
|
||||||
|
|
||||||
examplesinstallpath = printsupport
|
examplesinstallpath = printsupport
|
||||||
|
|
||||||
qhp.projects = QtPrintSupport
|
qhp.projects = QtPrintSupport
|
||||||
|
|
||||||
qhp.QtPrintSupport.file = qtprintsupport.qhp
|
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.virtualFolder = qtprintsupport
|
||||||
qhp.QtPrintSupport.indexTitle = Qt Print Support
|
qhp.QtPrintSupport.indexTitle = Qt Print Support
|
||||||
qhp.QtPrintSupport.indexRoot =
|
qhp.QtPrintSupport.indexRoot =
|
||||||
|
|
||||||
qhp.QtPrintSupport.filterAttributes = qtprintsupport 5.0.1 qtrefdoc
|
qhp.QtPrintSupport.filterAttributes = qtprintsupport $QT_VERSION qtrefdoc
|
||||||
qhp.QtPrintSupport.customFilters.Qt.name = QtPrintSupport 5.0.1
|
qhp.QtPrintSupport.customFilters.Qt.name = QtPrintSupport $QT_VERSION
|
||||||
qhp.QtPrintSupport.customFilters.Qt.filterAttributes = qtprintsupport 5.0.1
|
qhp.QtPrintSupport.customFilters.Qt.filterAttributes = qtprintsupport $QT_VERSION
|
||||||
|
|
||||||
qhp.QtPrintSupport.subprojects = classes
|
qhp.QtPrintSupport.subprojects = classes
|
||||||
qhp.QtPrintSupport.subprojects.classes.title = C++ Classes
|
qhp.QtPrintSupport.subprojects.classes.title = C++ Classes
|
||||||
|
@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
|
|||||||
project = QtSql
|
project = QtSql
|
||||||
description = Qt SQL Reference Documentation
|
description = Qt SQL Reference Documentation
|
||||||
url = http://qt-project.org/doc/qtsql
|
url = http://qt-project.org/doc/qtsql
|
||||||
version = 5.0.1
|
version = $QT_VERSION
|
||||||
|
|
||||||
examplesinstallpath = sql
|
examplesinstallpath = sql
|
||||||
|
|
||||||
qhp.projects = QtSql
|
qhp.projects = QtSql
|
||||||
|
|
||||||
qhp.QtSql.file = qtsql.qhp
|
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.virtualFolder = qtsql
|
||||||
qhp.QtSql.indexTitle = Qt SQL
|
qhp.QtSql.indexTitle = Qt SQL
|
||||||
qhp.QtSql.indexRoot =
|
qhp.QtSql.indexRoot =
|
||||||
|
|
||||||
qhp.QtSql.filterAttributes = qtsql 5.0.1 qtrefdoc
|
qhp.QtSql.filterAttributes = qtsql $QT_VERSION qtrefdoc
|
||||||
qhp.QtSql.customFilters.Qt.name = QtSql 5.0.1
|
qhp.QtSql.customFilters.Qt.name = QtSql $QT_VERSION
|
||||||
qhp.QtSql.customFilters.Qt.filterAttributes = qtsql 5.0.1
|
qhp.QtSql.customFilters.Qt.filterAttributes = qtsql $QT_VERSION
|
||||||
|
|
||||||
qhp.QtSql.subprojects = classes
|
qhp.QtSql.subprojects = classes
|
||||||
qhp.QtSql.subprojects.classes.title = C++ Classes
|
qhp.QtSql.subprojects.classes.title = C++ Classes
|
||||||
|
@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
|
|||||||
project = QtTestLib
|
project = QtTestLib
|
||||||
description = Qt Test Reference Documentation
|
description = Qt Test Reference Documentation
|
||||||
url = http://qt-project.org/doc/qttestlib
|
url = http://qt-project.org/doc/qttestlib
|
||||||
version = 5.0.1
|
version = $QT_VERSION
|
||||||
|
|
||||||
examplesinstallpath = testlib
|
examplesinstallpath = testlib
|
||||||
|
|
||||||
qhp.projects = QtTestLib
|
qhp.projects = QtTestLib
|
||||||
|
|
||||||
qhp.QtTestLib.file = qttestlib.qhp
|
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.virtualFolder = qttest
|
||||||
qhp.QtTestLib.indexTitle = Qt Test
|
qhp.QtTestLib.indexTitle = Qt Test
|
||||||
qhp.QtTestLib.indexRoot =
|
qhp.QtTestLib.indexRoot =
|
||||||
|
|
||||||
qhp.QtTestLib.filterAttributes = qttest 5.0.1 qtrefdoc
|
qhp.QtTestLib.filterAttributes = qttest $QT_VERSION qtrefdoc
|
||||||
qhp.QtTestLib.customFilters.Qt.name = QtTest 5.0.1
|
qhp.QtTestLib.customFilters.Qt.name = QtTest $QT_VERSION
|
||||||
qhp.QtTestLib.customFilters.Qt.filterAttributes = qttest 5.0.1
|
qhp.QtTestLib.customFilters.Qt.filterAttributes = qttest $QT_VERSION
|
||||||
|
|
||||||
qhp.QtTestLib.subprojects = classes
|
qhp.QtTestLib.subprojects = classes
|
||||||
qhp.QtTestLib.subprojects.classes.title = C++ Classes
|
qhp.QtTestLib.subprojects.classes.title = C++ Classes
|
||||||
|
@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
|
|||||||
project = QtWidgets
|
project = QtWidgets
|
||||||
description = Qt Widgets Reference Documentation
|
description = Qt Widgets Reference Documentation
|
||||||
url = http://qt-project.org/doc/qtwidgets
|
url = http://qt-project.org/doc/qtwidgets
|
||||||
version = 5.0.1
|
version = $QT_VERSION
|
||||||
|
|
||||||
examplesinstallpath = widgets
|
examplesinstallpath = widgets
|
||||||
|
|
||||||
qhp.projects = QtWidgets
|
qhp.projects = QtWidgets
|
||||||
|
|
||||||
qhp.QtWidgets.file = qtwidgets.qhp
|
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.virtualFolder = qtwidgets
|
||||||
qhp.QtWidgets.indexTitle = Qt Widgets
|
qhp.QtWidgets.indexTitle = Qt Widgets
|
||||||
qhp.QtWidgets.indexRoot =
|
qhp.QtWidgets.indexRoot =
|
||||||
|
|
||||||
qhp.QtWidgets.filterAttributes = qtwidgets 5.0.1 qtrefdoc
|
qhp.QtWidgets.filterAttributes = qtwidgets $QT_VERSION qtrefdoc
|
||||||
qhp.QtWidgets.customFilters.Qt.name = QtWidgets 5.0.1
|
qhp.QtWidgets.customFilters.Qt.name = QtWidgets $QT_VERSION
|
||||||
qhp.QtWidgets.customFilters.Qt.filterAttributes = qtwidgets 5.0.1
|
qhp.QtWidgets.customFilters.Qt.filterAttributes = qtwidgets $QT_VERSION
|
||||||
|
|
||||||
qhp.QtWidgets.subprojects = classes
|
qhp.QtWidgets.subprojects = classes
|
||||||
qhp.QtWidgets.subprojects.classes.title = C++ Classes
|
qhp.QtWidgets.subprojects.classes.title = C++ Classes
|
||||||
|
@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
|
|||||||
project = QtXml
|
project = QtXml
|
||||||
description = Qt XML Reference Documentation
|
description = Qt XML Reference Documentation
|
||||||
url = http://qt-project.org/doc/qtxml
|
url = http://qt-project.org/doc/qtxml
|
||||||
version = 5.0.1
|
version = $QT_VERSION
|
||||||
|
|
||||||
examplesinstallpath = xml
|
examplesinstallpath = xml
|
||||||
|
|
||||||
qhp.projects = QtXml
|
qhp.projects = QtXml
|
||||||
|
|
||||||
qhp.QtXml.file = qtxml.qhp
|
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.virtualFolder = qtxml
|
||||||
qhp.QtXml.indexTitle = Qt XML
|
qhp.QtXml.indexTitle = Qt XML
|
||||||
qhp.QtXml.indexRoot =
|
qhp.QtXml.indexRoot =
|
||||||
|
|
||||||
qhp.QtXml.filterAttributes = qtxml 5.0.1 qtrefdoc
|
qhp.QtXml.filterAttributes = qtxml $QT_VERSION qtrefdoc
|
||||||
qhp.QtXml.customFilters.Qt.name = QtXml 5.0.1
|
qhp.QtXml.customFilters.Qt.name = QtXml $QT_VERSION
|
||||||
qhp.QtXml.customFilters.Qt.filterAttributes = qtxml 5.0.1
|
qhp.QtXml.customFilters.Qt.filterAttributes = qtxml $QT_VERSION
|
||||||
|
|
||||||
qhp.QtXml.subprojects = classes
|
qhp.QtXml.subprojects = classes
|
||||||
qhp.QtXml.subprojects.classes.title = C++ Classes
|
qhp.QtXml.subprojects.classes.title = C++ Classes
|
||||||
|
Loading…
Reference in New Issue
Block a user