diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 09:24:58 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 09:25:13 +0100 |
commit | f213905ad6a755da57a8af904aa9c46ce9d7faca (patch) | |
tree | c64e59884996b053dafef8892b41cc501004fa6b | |
parent | bb08129989ecf91a6f1acffa6e005d20c5ee44af (diff) | |
parent | 897bec4496cf8090c19b18715e254a0713cfada2 (diff) | |
download | qtgraphicaleffects-f213905ad6a755da57a8af904aa9c46ce9d7faca.tar.gz |
Merge branch 'stable' into release
Change-Id: I00358ee7fb55d5cc5537c3935a4de611c2381545
-rw-r--r-- | dist/changes-5.0.1 | 51 | ||||
-rw-r--r-- | src/effects/doc/qtgraphicaleffects.qdocconf | 8 |
2 files changed, 55 insertions, 4 deletions
diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1 new file mode 100644 index 0000000..cc5a670 --- /dev/null +++ b/dist/changes-5.0.1 @@ -0,0 +1,51 @@ +Qt 5.0.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.0.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://qt-project.org/doc/qt-5.0/ + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt-project.org/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + +**************************************************************************** +* General * +**************************************************************************** + +General Improvements +-------------------- + +Third party components +---------------------- + +**************************************************************************** +* Library * +**************************************************************************** + + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + + +**************************************************************************** +* Compiler Specific Changes * +**************************************************************************** + + +**************************************************************************** +* Tools * +**************************************************************************** + + +**************************************************************************** +* Plugins * +**************************************************************************** + diff --git a/src/effects/doc/qtgraphicaleffects.qdocconf b/src/effects/doc/qtgraphicaleffects.qdocconf index 96ffeca..4d75fd9 100644 --- a/src/effects/doc/qtgraphicaleffects.qdocconf +++ b/src/effects/doc/qtgraphicaleffects.qdocconf @@ -3,7 +3,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtGraphicalEffects description = Qt Graphical Effects Reference Documentation url = http://qt-project.org/doc/qtgraphicaleffects/ -version = 5.0.0 +version = 5.0.1 qhp.projects = QtGraphicalEffects @@ -13,9 +13,9 @@ qhp.QtGraphicalEffects.virtualFolder = qtgraphicaleffects qhp.QtGraphicalEffects.indexTitle = Qt Graphical Effects qhp.QtGraphicalEffects.indexRoot = -qhp.QtGraphicalEffects.filterAttributes = qtgraphicaleffects 5.0.0 qtrefdoc -qhp.QtGraphicalEffects.customFilters.Qt.name = QtGraphicalEffects 5.0.0 -qhp.QtGraphicalEffects.customFilters.Qt.filterAttributes = qtgraphicaleffects 5.0.0 +qhp.QtGraphicalEffects.filterAttributes = qtgraphicaleffects 5.0.1 qtrefdoc +qhp.QtGraphicalEffects.customFilters.Qt.name = QtGraphicalEffects 5.0.1 +qhp.QtGraphicalEffects.customFilters.Qt.filterAttributes = qtgraphicaleffects 5.0.1 qhp.QtGraphicalEffects.subprojects = qmltypes qhp.QtGraphicalEffects.subprojects.qmltypes.title = QML Types |