src/imports/dialogs/doc/qtquickdialogs.qdocconf

@@ -19,10 +19,9 @@ qhp.QtQuickDialogs.customFilters.Qt.filterAttributes = qtquickdialogs $QT_VERSIO
 
 qhp.QtQuickDialogs.subprojects = qtquickdialogsqmltypes
 qhp.QtQuickDialogs.subprojects.qtquickdialogsqmltypes.title = QML Types
-qhp.QtQuickDialogs.subprojects.qtquickdialogsqmltypes.indexTitle = Qt Quick Dialogs
+qhp.QtQuickDialogs.subprojects.qtquickdialogsqmltypes.indexTitle = Qt Quick Dialogs QML Types
 qhp.QtQuickDialogs.subprojects.qtquickdialogsqmltypes.selectors = fake:qmlclass
 qhp.QtQuickDialogs.subprojects.qtquickdialogsqmltypes.sortPages = true
-qhp.QtQuickDialogs.subprojects.qtquickdialogsqmltypes.type = manual
 
 depends = qtqml qtquick qtgui qtwidgets qtdoc
 

src/qml/doc/qtqml.qdocconf

@@ -18,7 +18,7 @@ qhp.QtQml.indexRoot           =
 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         = qmltypes classes examples
 qhp.QtQml.subprojects.classes.title = C++ Classes
 qhp.QtQml.subprojects.classes.indexTitle = Qt QML C++ Classes
 qhp.QtQml.subprojects.classes.selectors = class fake:headerfile
@@ -26,6 +26,10 @@ qhp.QtQml.subprojects.classes.sortPages = true
 qhp.QtQml.subprojects.examples.title = Examples
 qhp.QtQml.subprojects.examples.indexTitle = Qt Quick Code Samples
 qhp.QtQml.subprojects.examples.selectors = fake:example
+qhp.QtQml.subprojects.qmltypes.title = QML Types
+qhp.QtQml.subprojects.qmltypes.indexTitle = Qt QML QML Types
+qhp.QtQml.subprojects.qmltypes.selectors = fake:qmlclass
+qhp.QtQml.subprojects.qmltypes.sortPages = true
 
 
 tagfile                 = ../../../doc/qtqml/qtqml.tags

src/quick/doc/src/qmltypereference.qdoc

@@ -56,19 +56,19 @@ information about the concepts which are central to \c QtQuick.
     Qt Quick includes several submodules which contain additional types.
 
     \list
-    \li \l{QtQuick.XmlListModel 2}{XML List Model} - contains types
+    \li \l{Qt Quick XmlListModel QML Types}{XML List Model} - contains types
     for creating models from XML data
-    \li \l{QtQuick.LocalStorage 2}{Local Storage} - a submodule
+    \li \l{Qt Quick Local Storage QML Types}{Local Storage} - a submodule
     containing a JavaScript interface for an SQLite database
-    \li \l{QtQuick.Particles 2}{Particles} - provides a particle
+    \li \l{Qt Quick Particles QML Types}{Particles} - provides a particle
     system for QML applications
-    \li \l{QtQuick.Window 2}{Window} - contains types for creating
+    \li \l{Qt Quick Window QML Types}{Window} - contains types for creating
     top-level windows and accessing screen information
-    \li \l{QtQuick.Dialogs 1}{Dialogs} - contains types for creating and
+    \li \l{Qt Quick Dialogs QML Types}{Dialogs} - contains types for creating and
     interacting with system dialogs
-    \li \l{QtQuick.Controls 1.0}{Controls} - provides a set of reusable
+    \li \l{Qt Quick Controls QML Types}{Controls} - provides a set of reusable
     UI components
-    \li \l{QtQuick.Layouts 1.0}{Layouts} - contains types that are used
+    \li \l{Qt Quick Layouts QML Types}{Layouts} - contains types that are used
     to arrange items in the user interface
     \endlist
 

src/quick/items/context2d/qquickcontext2d.cpp

@@ -2624,7 +2624,7 @@ static v8::Handle<v8::Value> ctx2d_createImageData(const v8::Arguments &args)
 }
 
 /*!
-  \qmlmethod CanvasImageData QtQuick2::Canvas::getImageData(real sx, real sy, real sw, real sh)
+  \qmlmethod CanvasImageData QtQuick2::Context2D::getImageData(real sx, real sy, real sw, real sh)
   Returns an CanvasImageData object containing the image data for the given rectangle of the canvas.
   */
 static v8::Handle<v8::Value> ctx2d_getImageData(const v8::Arguments &args)