aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-01-30 17:36:45 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-06 09:44:50 +0100
commit34c679bc32ae98067cd1cca5564e03f629a0f3b8 (patch)
tree4ec4d8afc3a57a8a395db42a3e75f5181025fb37
parentc0ec84946d13e4693160e859c947696e92ef615b (diff)
substitute fixed version numbers in qdocconf files with variables
Change-Id: If28446d2d14dde62ff662ffdd366dc6384c95326 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--src/qml/doc/qtqml.qdocconf12
-rw-r--r--src/quick/doc/qtquick.qdocconf12
2 files changed, 12 insertions, 12 deletions
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf
index 5a289767ba..61d7e706ec 100644
--- a/src/qml/doc/qtqml.qdocconf
+++ b/src/qml/doc/qtqml.qdocconf
@@ -2,20 +2,20 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtQml
description = Qt QML Reference Documentation
-url = http://qt-project.org/doc/qt-5.0/qtqml
-version = 5.0.1
+url = http://qt-project.org/doc/qt-$QT_VER/qtqml
+version = $QT_VERSION
qhp.projects = QtQml
qhp.QtQml.file = qtqml.qhp
-qhp.QtQml.namespace = org.qt-project.qtqml.501
+qhp.QtQml.namespace = org.qt-project.qtqml.$QT_VERSION_TAG
qhp.QtQml.virtualFolder = qtqml
qhp.QtQml.indexTitle = Qt QML
qhp.QtQml.indexRoot =
-qhp.QtQml.filterAttributes = qtqml 5.0.1 qtrefdoc
-qhp.QtQml.customFilters.Qt.name = QtQml 5.0.1
-qhp.QtQml.customFilters.Qt.filterAttributes = qtqml 5.0.1
+qhp.QtQml.filterAttributes = qtqml $QT_VERSION qtrefdoc
+qhp.QtQml.customFilters.Qt.name = QtQml $QT_VERSION
+qhp.QtQml.customFilters.Qt.filterAttributes = qtqml $QT_VERSION
qhp.QtQml.subprojects = classes examples
qhp.QtQml.subprojects.classes.title = C++ Classes
qhp.QtQml.subprojects.classes.indexTitle = Qt QML Module C++ Classes
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 6af5a1281c..7fba78da10 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -2,21 +2,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtQuick
description = Qt Quick Reference Documentation
-url = http://qt-project.org/doc/qt-5.0/qtquick-index.html
-version = 5.0.1
+url = http://qt-project.org/doc/qt-$QT_VER/qtquick-index.html
+version = $QT_VERSION
qhp.projects = QtQuick
qhp.QtQuick.file = qtquick.qhp
-qhp.QtQuick.namespace = org.qt-project.qtquick.501
+qhp.QtQuick.namespace = org.qt-project.qtquick.$QT_VERSION_TAG
qhp.QtQuick.virtualFolder = qtquick
qhp.QtQuick.indexTitle = Qt Quick
qhp.QtQuick.indexRoot =
-qhp.QtQuick.filterAttributes = qtquick 5.0.1 qtrefdoc
-qhp.QtQuick.customFilters.Qt.name = QtQuick 5.0.1
-qhp.QtQuick.customFilters.Qt.filterAttributes = qtquick 5.0.1
+qhp.QtQuick.filterAttributes = qtquick $QT_VERSION qtrefdoc
+qhp.QtQuick.customFilters.Qt.name = QtQuick $QT_VERSION
+qhp.QtQuick.customFilters.Qt.filterAttributes = qtquick $QT_VERSION
qhp.QtQuick.subprojects = qmltypes classes examples
qhp.QtQuick.subprojects.qmltypes.title = QML Types
qhp.QtQuick.subprojects.qmltypes.indexTitle = Qt Quick QML Types