summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-01-31 15:53:33 +0100
committerSergio Ahumada <sergio.ahumada@digia.com>2013-01-31 15:56:27 +0100
commit17626e935cbb477f93fc43082af5744731614e3a (patch)
tree987abb00565fdd40620589ff5e53b6128612d183
parent0321486f20b67d3d0befce30c9ad1b0862b5a346 (diff)
parent1829dc82cac3657c31c7c5455f8d9d84540eec8f (diff)
downloadqtgraphicaleffects-17626e935cbb477f93fc43082af5744731614e3a.tar.gz
Merge branch 'release' into stable
Change-Id: I925f12d3a45bfaef51387b194da9d48605ee346d
-rw-r--r--dist/changes-5.0.131
-rw-r--r--src/effects/doc/qtgraphicaleffects.qdocconf4
2 files changed, 3 insertions, 32 deletions
diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1
index cc5a670..5fea7ba 100644
--- a/dist/changes-5.0.1
+++ b/dist/changes-5.0.1
@@ -19,33 +19,4 @@ information about a particular change.
* General *
****************************************************************************
-General Improvements
---------------------
-
-Third party components
-----------------------
-
-****************************************************************************
-* Library *
-****************************************************************************
-
-
-****************************************************************************
-* Platform Specific Changes *
-****************************************************************************
-
-
-****************************************************************************
-* Compiler Specific Changes *
-****************************************************************************
-
-
-****************************************************************************
-* Tools *
-****************************************************************************
-
-
-****************************************************************************
-* Plugins *
-****************************************************************************
-
+ - This release contains only minor code improvements.
diff --git a/src/effects/doc/qtgraphicaleffects.qdocconf b/src/effects/doc/qtgraphicaleffects.qdocconf
index 4d75fd9..3be69c1 100644
--- a/src/effects/doc/qtgraphicaleffects.qdocconf
+++ b/src/effects/doc/qtgraphicaleffects.qdocconf
@@ -8,7 +8,7 @@ version = 5.0.1
qhp.projects = QtGraphicalEffects
qhp.QtGraphicalEffects.file = qtgraphicaleffects.qhp
-qhp.QtGraphicalEffects.namespace = org.qt-project.qtgraphicaleffects.500
+qhp.QtGraphicalEffects.namespace = org.qt-project.qtgraphicaleffects.501
qhp.QtGraphicalEffects.virtualFolder = qtgraphicaleffects
qhp.QtGraphicalEffects.indexTitle = Qt Graphical Effects
qhp.QtGraphicalEffects.indexRoot =
@@ -20,7 +20,7 @@ qhp.QtGraphicalEffects.customFilters.Qt.filterAttributes = qtgraphicaleffects 5.
qhp.QtGraphicalEffects.subprojects = qmltypes
qhp.QtGraphicalEffects.subprojects.qmltypes.title = QML Types
qhp.QtGraphicalEffects.subprojects.qmltypes.indexTitle = Graphical Effects
-qhp.QtGraphicalEffects.subprojects.qmltypes.selectors = class fake:headerfile
+qhp.QtGraphicalEffects.subprojects.qmltypes.selectors = fake:qmlclass
qhp.QtGraphicalEffects.subprojects.qmltypes.sortPages = true
outputdir = $$QT_INSTALL_DOCS/qtgraphicaleffects