diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-07 17:06:03 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-07 17:07:44 +0100 |
| commit | b907a01b467b551756b108f6c9a04d7e7382ae64 (patch) | |
| tree | 2d21d785186ce485f615034e6667d9673b62a4fc /src/qml/doc/qtqml.qdocconf | |
| parent | 4f8537ff8c9427705e3587861a62fe81cf3e503b (diff) | |
| parent | 1d29d8edf8e4e709ca2f27791cdf8672c15488f3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
examples/quick/textureprovider/etcprovider.h
src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp
src/qml/doc/qtqml.qdocconf
src/quick/doc/qtquick.qdocconf
tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
Change-Id: I5027b0ee024e00b9525bd45516b7f401ff7d4ae4
Diffstat (limited to 'src/qml/doc/qtqml.qdocconf')
| -rw-r--r-- | src/qml/doc/qtqml.qdocconf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf index 45fecc1896..ecd6b81823 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.1.0 +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.510 +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.1.0 qtrefdoc -qhp.QtQml.customFilters.Qt.name = QtQml 5.1.0 -qhp.QtQml.customFilters.Qt.filterAttributes = qtqml 5.1.0 +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 |