Doc: Changed \qmlclass to \qmltype and added \instantiates

-\qmlclass is now \qmltype
-\instantiates is for QML types implemented in C++

Change-Id: I017822524de1879d272d777ec7681f4233128b01
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

44 files changed, 170 insertions, 85 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
index 7472242d..7efab822 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
@@ -54,7 +54,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass AnimatedImage QDeclarativeAnimatedImage
+    \qmltype AnimatedImage
+    \instantiates QDeclarativeAnimatedImage
     \inherits Image
     \since 4.7
     \ingroup basic-visual-elements
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 490330c1..db8bbf16 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -53,7 +53,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass BorderImage QDeclarativeBorderImage
+    \qmltype BorderImage
+    \instantiates QDeclarativeBorderImage
     \brief The BorderImage element provides an image that can be used as a border.
     \inherits Item
     \since 4.7
diff --git a/src/declarative/graphicsitems/qdeclarativeevents.cpp b/src/declarative/graphicsitems/qdeclarativeevents.cpp
index 6ba97cb7..791970d8 100644
--- a/src/declarative/graphicsitems/qdeclarativeevents.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeevents.cpp
@@ -43,7 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 /*!
-    \qmlclass KeyEvent QDeclarativeKeyEvent
+    \qmltype KeyEvent
+    \instantiates QDeclarativeKeyEvent
     \since 4.7
     \ingroup qml-event-elements
     
@@ -138,7 +139,8 @@ Item {
 
 
 /*!
-    \qmlclass MouseEvent QDeclarativeMouseEvent
+    \qmltype MouseEvent
+    \instantiates QDeclarativeMouseEvent
     \since 4.7
     \ingroup qml-event-elements
 
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index bfc121b0..e114b4ee 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -425,7 +425,8 @@ void QDeclarativeFlickablePrivate::updateBeginningEnd()
 }
 
 /*!
-    \qmlclass Flickable QDeclarativeFlickable
+    \qmltype Flickable
+    \instantiates QDeclarativeFlickable
     \since 4.7
     \ingroup qml-basic-interaction-elements
 
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
index 9ae680c2..9a9de455 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -68,7 +68,8 @@ public:
 };
 
 /*!
-    \qmlclass Flipable QDeclarativeFlipable
+    \qmltype Flipable
+    \instantiates QDeclarativeFlipable
     \since 4.7
     \ingroup qml-basic-interaction-elements
     \brief The Flipable item provides a surface that can be flipped.
diff --git a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
index a907ee0a..e6e85222 100644
--- a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
@@ -49,7 +49,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-   \qmlclass FocusPanel QDeclarativeFocusPanel
+   \qmltype FocusPanel
+    \instantiates QDeclarativeFocusPanel
     \since 4.7
     \ingroup qml-basic-interaction-elements
 
diff --git a/src/declarative/graphicsitems/qdeclarativefocusscope.cpp b/src/declarative/graphicsitems/qdeclarativefocusscope.cpp
index 13d89156..bb92b152 100644
--- a/src/declarative/graphicsitems/qdeclarativefocusscope.cpp
+++ b/src/declarative/graphicsitems/qdeclarativefocusscope.cpp
@@ -46,7 +46,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass FocusScope QDeclarativeFocusScope
+    \qmltype FocusScope
+    \instantiates QDeclarativeFocusScope
     \since 4.7
     \ingroup qml-basic-interaction-elements
 
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 99ab192d..c4e1fcfe 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1270,7 +1270,8 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
 //----------------------------------------------------------------------------
 
 /*!
-    \qmlclass GridView QDeclarativeGridView
+    \qmltype GridView
+    \instantiates QDeclarativeGridView
     \since 4.7
     \ingroup qml-view-elements
 
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index 375b9503..e5010d85 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -49,7 +49,8 @@ QT_BEGIN_NAMESPACE
 
 
 /*!
-    \qmlclass Image QDeclarativeImage
+    \qmltype Image
+    \instantiates QDeclarativeImage
     \since 4.7
     \ingroup qml-basic-visual-elements
     \brief The Image element displays an image in a declarative user interface
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index b86d0e1a..dc7fb71c 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -68,7 +68,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Transform QGraphicsTransform
+    \qmltype Transform
+    \instantiates QGraphicsTransform
     \ingroup qml-transform-elements
     \since 4.7
     \brief The Transform elements provide a way of building advanced transformations on Items.
@@ -90,7 +91,8 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlclass Translate QDeclarativeTranslate
+    \qmltype Translate
+    \instantiates QDeclarativeTranslate
     \ingroup qml-transform-elements
     \since 4.7
     \brief The Translate object provides a way to move an Item without changing its x or y properties.
@@ -132,7 +134,8 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlclass Scale QGraphicsScale
+    \qmltype Scale
+    \instantiates QGraphicsScale
     \ingroup qml-transform-elements
     \since 4.7
     \brief The Scale element provides a way to scale an Item.
@@ -174,7 +177,8 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlclass Rotation QGraphicsRotation
+    \qmltype Rotation
+    \instantiates QGraphicsRotation
     \ingroup qml-transform-elements
     \since 4.7
     \brief The Rotation object provides a way to rotate an Item.
@@ -416,7 +420,8 @@ void QDeclarativeItemKeyFilter::componentComplete()
 
 
 /*!
-    \qmlclass KeyNavigation QDeclarativeKeyNavigationAttached
+    \qmltype KeyNavigation
+    \instantiates QDeclarativeKeyNavigationAttached
     \ingroup qml-basic-interaction-elements
     \since 4.7
     \brief The KeyNavigation attached property supports key navigation by arrow keys.
@@ -743,7 +748,8 @@ void QDeclarativeKeyNavigationAttached::setFocusNavigation(QDeclarativeItem *cur
 }
 
 /*!
-    \qmlclass LayoutMirroring QDeclarativeLayoutMirroringAttached
+    \qmltype LayoutMirroring
+    \instantiates QDeclarativeLayoutMirroringAttached
     \since QtQuick 1.1
     \ingroup qml-utility-elements
     \brief The LayoutMirroring attached property is used to mirror layout behavior.
@@ -907,7 +913,8 @@ void QDeclarativeItemPrivate::setLayoutMirror(bool mirror)
 }
 
 /*!
-    \qmlclass Keys QDeclarativeKeysAttached
+    \qmltype Keys
+    \instantiates QDeclarativeKeysAttached
     \ingroup qml-basic-interaction-elements
     \since 4.7
     \brief The Keys attached property provides key handling to Items.
@@ -1514,7 +1521,8 @@ QDeclarativeKeysAttached *QDeclarativeKeysAttached::qmlAttachedProperties(QObjec
 */
 
 /*!
-    \qmlclass Item QDeclarativeItem
+    \qmltype Item
+    \instantiates QDeclarativeItem
     \ingroup qml-basic-visual-elements
     \since 4.7
     \brief The Item is the most basic of all visual items in QML.
diff --git a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
index 3d333314..f1b3f7f6 100644
--- a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
@@ -48,7 +48,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass LayoutItem QDeclarativeLayoutItem
+    \qmltype LayoutItem
+    \instantiates QDeclarativeLayoutItem
     \ingroup qml-utility-elements
     \since 4.7
     \brief The LayoutItem element allows declarative UI elements to be placed inside Qt's Graphics View layouts.
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 1062e37f..73a34799 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1560,7 +1560,8 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
 //----------------------------------------------------------------------------
 
 /*!
-    \qmlclass ListView QDeclarativeListView
+    \qmltype ListView
+    \instantiates QDeclarativeListView
     \ingroup qml-view-elements
     \since 4.7
     \inherits Flickable
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index b6cd323d..162e1dcb 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -117,7 +117,8 @@ void QDeclarativeLoaderPrivate::initResize()
 }
 
 /*!
-    \qmlclass Loader QDeclarativeLoader
+    \qmltype Loader
+    \instantiates QDeclarativeLoader
     \ingroup qml-utility-elements
     \since 4.7
     \inherits Item
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index b0a48615..96f8a82b 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -179,7 +179,8 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate()
 }
 
 /*!
-    \qmlclass MouseArea QDeclarativeMouseArea
+    \qmltype MouseArea
+    \instantiates QDeclarativeMouseArea
     \ingroup qml-basic-interaction-elements
     \since 4.7
     \brief The MouseArea item enables simple mouse handling.
diff --git a/src/declarative/graphicsitems/qdeclarativepath.cpp b/src/declarative/graphicsitems/qdeclarativepath.cpp
index 0b7c1458..e1fd5122 100644
--- a/src/declarative/graphicsitems/qdeclarativepath.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepath.cpp
@@ -52,7 +52,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass PathElement QDeclarativePathElement
+    \qmltype PathElement
+    \instantiates QDeclarativePathElement
     \ingroup qml-view-elements
     \since 4.7
     \brief PathElement is the base path type.
@@ -64,7 +65,8 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlclass Path QDeclarativePath
+    \qmltype Path
+    \instantiates QDeclarativePath
     \ingroup qml-view-elements
     \since 4.7
     \brief A Path object defines a path for use by \l PathView.
@@ -492,7 +494,8 @@ void QDeclarativeCurve::setY(qreal y)
 /****************************************************************************/
 
 /*!
-    \qmlclass PathAttribute QDeclarativePathAttribute
+    \qmltype PathAttribute
+    \instantiates QDeclarativePathAttribute
     \ingroup qml-view-elements
     \since 4.7
     \brief The PathAttribute allows setting an attribute at a given position in a Path.
@@ -608,7 +611,8 @@ void QDeclarativePathAttribute::setValue(qreal value)
 /****************************************************************************/
 
 /*!
-    \qmlclass PathLine QDeclarativePathLine
+    \qmltype PathLine
+    \instantiates QDeclarativePathLine
     \ingroup qml-view-elements
     \since 4.7
     \brief The PathLine defines a straight line.
@@ -641,7 +645,8 @@ void QDeclarativePathLine::addToPath(QPainterPath &path)
 /****************************************************************************/
 
 /*!
-    \qmlclass PathQuad QDeclarativePathQuad
+    \qmltype PathQuad
+    \instantiates QDeclarativePathQuad
     \ingroup qml-view-elements
     \since 4.7
     \brief The PathQuad defines a quadratic Bezier curve with a control point.
@@ -719,7 +724,8 @@ void QDeclarativePathQuad::addToPath(QPainterPath &path)
 /****************************************************************************/
 
 /*!
-   \qmlclass PathCubic QDeclarativePathCubic
+   \qmltype PathCubic
+    \instantiates QDeclarativePathCubic
     \ingroup qml-view-elements
     \since 4.7
    \brief The PathCubic defines a cubic Bezier curve with two control points.
@@ -827,7 +833,8 @@ void QDeclarativePathCubic::addToPath(QPainterPath &path)
 /****************************************************************************/
 
 /*!
-    \qmlclass PathPercent QDeclarativePathPercent
+    \qmltype PathPercent
+    \instantiates QDeclarativePathPercent
     \ingroup qml-view-elements
     \since 4.7
     \brief The PathPercent manipulates the way a path is interpreted.
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 0d4d1caf..d96fd18e 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -347,7 +347,8 @@ void QDeclarativePathViewPrivate::regenerate()
 }
 
 /*!
-    \qmlclass PathView QDeclarativePathView
+    \qmltype PathView
+    \instantiates QDeclarativePathView
     \ingroup qml-view-elements
     \since 4.7
     \brief The PathView element lays out model-provided items on a path.
diff --git a/src/declarative/graphicsitems/qdeclarativepincharea.cpp b/src/declarative/graphicsitems/qdeclarativepincharea.cpp
index adff025f..b4b0e6db 100644
--- a/src/declarative/graphicsitems/qdeclarativepincharea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepincharea.cpp
@@ -52,7 +52,8 @@ QT_BEGIN_NAMESPACE
 
 
 /*!
-    \qmlclass PinchEvent QDeclarativePinchEvent
+    \qmltype PinchEvent
+    \instantiates QDeclarativePinchEvent
     \ingroup qml-event-elements
     \brief The PinchEvent object provides information about a pinch event.
 
@@ -160,7 +161,8 @@ QDeclarativePinchAreaPrivate::~QDeclarativePinchAreaPrivate()
 }
 
 /*!
-    \qmlclass PinchArea QDeclarativePinchArea
+    \qmltype PinchArea
+    \instantiates QDeclarativePinchArea
     \brief The PinchArea item enables simple pinch gesture handling.
     \inherits Item
 
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
index 41605b87..936213c7 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -322,7 +322,8 @@ void QDeclarativeBasePositioner::finishApplyTransitions()
 }
 
 /*!
-  \qmlclass Column QDeclarativeColumn
+  \qmltype Column
+    \instantiates QDeclarativeColumn
   \ingroup qml-positioning-elements
   \since 4.7
   \brief The Column item arranges its children vertically.
@@ -486,7 +487,8 @@ void QDeclarativeColumn::reportConflictingAnchors()
 }
 
 /*!
-  \qmlclass Row QDeclarativeRow
+  \qmltype Row
+    \instantiates QDeclarativeRow
   \ingroup qml-positioning-elements
   \since 4.7
   \brief The Row item arranges its children horizontally.
@@ -700,7 +702,8 @@ void QDeclarativeRow::reportConflictingAnchors()
 }
 
 /*!
-  \qmlclass Grid QDeclarativeGrid
+  \qmltype Grid
+    \instantiates QDeclarativeGrid
   \ingroup qml-positioning-elements
   \since 4.7
   \brief The Grid item positions its children in a grid.
@@ -1085,7 +1088,8 @@ void QDeclarativeGrid::reportConflictingAnchors()
 }
 
 /*!
-  \qmlclass Flow QDeclarativeFlow
+  \qmltype Flow
+    \instantiates QDeclarativeFlow
   \ingroup qml-positioning-elements
   \since 4.7
   \brief The Flow item arranges its children side by side, wrapping as necessary.
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
index 167da0ff..3562d05b 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
@@ -87,7 +87,8 @@ void QDeclarativePen::setWidth(int w)
 
 
 /*!
-    \qmlclass GradientStop QDeclarativeGradientStop
+    \qmltype GradientStop
+    \instantiates QDeclarativeGradientStop
     \ingroup qml-basic-visual-elements
     \since 4.7
     \brief The GradientStop item defines the color at a position in a Gradient.
@@ -114,7 +115,8 @@ void QDeclarativeGradientStop::updateGradient()
 }
 
 /*!
-    \qmlclass Gradient QDeclarativeGradient
+    \qmltype Gradient
+    \instantiates QDeclarativeGradient
     \ingroup qml-basic-visual-elements
     \since 4.7
     \brief The Gradient item defines a gradient fill.
@@ -196,7 +198,8 @@ void QDeclarativeGradient::doUpdate()
 
 
 /*!
-    \qmlclass Rectangle QDeclarativeRectangle
+    \qmltype Rectangle
+    \instantiates QDeclarativeRectangle
     \ingroup qml-basic-visual-elements
     \since 4.7
     \brief The Rectangle item provides a filled rectangle with an optional border.
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
index 07950fba..76d730ff 100644
--- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
@@ -61,7 +61,8 @@ QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate()
 }
 
 /*!
-    \qmlclass Repeater QDeclarativeRepeater
+    \qmltype Repeater
+    \instantiates QDeclarativeRepeater
     \ingroup qml-utility-elements
     \since 4.7
     \inherits Item
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index e668d4f7..a776a1b4 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -664,7 +664,8 @@ QPixmap QDeclarativeTextPrivate::drawOutline(const QPixmap &source, const QPixma
 }
 
 /*!
-    \qmlclass Text QDeclarativeText
+    \qmltype Text
+    \instantiates QDeclarativeText
     \ingroup qml-basic-visual-elements
     \since 4.7
     \brief The Text item allows you to add formatted text to a scene.
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 978e25db..05f7b823 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -63,7 +63,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass TextEdit QDeclarativeTextEdit
+    \qmltype TextEdit
+    \instantiates QDeclarativeTextEdit
     \ingroup qml-basic-visual-elements
     \since 4.7
     \brief The TextEdit item displays multiple lines of editable formatted text.
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 5f9d1b76..c3491ceb 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -61,7 +61,8 @@ QT_BEGIN_NAMESPACE
 
 
 /*!
-    \qmlclass TextInput QDeclarativeTextInput
+    \qmltype TextInput
+    \instantiates QDeclarativeTextInput
     \ingroup qml-basic-visual-elements
     \since 4.7
     \brief The TextInput item displays an editable line of text.
@@ -682,7 +683,8 @@ void QDeclarativeTextInput::setAutoScroll(bool b)
 }
 
 /*!
-    \qmlclass IntValidator QIntValidator
+    \qmltype IntValidator
+    \instantiates QIntValidator
     \ingroup qml-basic-visual-elements
 
     This element provides a validator for integer values.
@@ -706,7 +708,8 @@ void QDeclarativeTextInput::setAutoScroll(bool b)
 */
 
 /*!
-    \qmlclass DoubleValidator QDoubleValidator
+    \qmltype DoubleValidator
+    \instantiates QDoubleValidator
     \ingroup qml-basic-visual-elements
 
     This element provides a validator for non-integer numbers.
@@ -745,7 +748,8 @@ void QDeclarativeTextInput::setAutoScroll(bool b)
 */
 
 /*!
-    \qmlclass RegExpValidator QRegExpValidator
+    \qmltype RegExpValidator
+    \instantiates QRegExpValidator
     \ingroup qml-basic-visual-elements
 
     This element provides a validator, which counts as valid any string which
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index 2c4e8641..aeaa27ca 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -127,7 +127,8 @@ public:
 
 
 /*!
-    \qmlclass VisualItemModel QDeclarativeVisualItemModel
+    \qmltype VisualItemModel
+    \instantiates QDeclarativeVisualItemModel
     \ingroup qml-working-with-data
   \since 4.7
     \brief The VisualItemModel allows items to be provided to a view.
@@ -641,7 +642,8 @@ QDeclarativeVisualDataModelData *QDeclarativeVisualDataModelPrivate::data(QObjec
 //---------------------------------------------------------------------------
 
 /*!
-    \qmlclass VisualDataModel QDeclarativeVisualDataModel
+    \qmltype VisualDataModel
+    \instantiates QDeclarativeVisualDataModel
     \ingroup qml-working-with-data
     \brief The VisualDataModel encapsulates a model and delegate
 
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 3a219be2..6b007b94 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -141,7 +141,8 @@ class QByteArray;
 */
 
 /*!
-    \qmlclass Component QDeclarativeComponent
+    \qmltype Component
+    \instantiates QDeclarativeComponent
     \ingroup qml-utility-elements
     \since 4.7
     \brief The Component element encapsulates a QML component definition.
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 5d241880..bbf2b6be 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -118,7 +118,8 @@ Q_DECLARE_METATYPE(QDeclarativeProperty)
 QT_BEGIN_NAMESPACE
 
 /*!
-  \qmlclass QtObject QObject
+  \qmltype QtObject
+    \instantiates QObject
   \ingroup qml-utility-elements
   \since 4.7
   \brief The QtObject element is the most basic element in QML.
@@ -197,7 +198,8 @@ void QDeclarativeEnginePrivate::defineModule()
 }
 
 /*!
-\qmlclass QML:Qt QDeclarativeEnginePrivate
+\qmltype QML:Qt
+\instantiates QDeclarativeEnginePrivate
   \ingroup qml-utility-elements
 \brief The QML global Qt object provides useful enums and functions from Qt.
 
diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp
index 0cc47302..b5eb4275 100644
--- a/src/declarative/qml/qdeclarativeworkerscript.cpp
+++ b/src/declarative/qml/qdeclarativeworkerscript.cpp
@@ -582,7 +582,8 @@ void QDeclarativeWorkerScriptEngine::run()
 
 
 /*!
-    \qmlclass WorkerScript QDeclarativeWorkerScript
+    \qmltype WorkerScript
+    \instantiates QDeclarativeWorkerScript
     \ingroup qml-utility-elements
     \brief The WorkerScript element enables the use of threads in QML.
 
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index f697a49d..66dcb126 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -73,7 +73,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Animation QDeclarativeAbstractAnimation
+    \qmltype Animation
+    \instantiates QDeclarativeAbstractAnimation
     \ingroup qml-animation-transition
     \since 4.7
     \brief The Animation element is the base of all QML animations.
@@ -553,7 +554,8 @@ void QDeclarativeAbstractAnimation::timelineComplete()
 }
 
 /*!
-    \qmlclass PauseAnimation QDeclarativePauseAnimation
+    \qmltype PauseAnimation
+    \instantiates QDeclarativePauseAnimation
     \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
@@ -624,7 +626,8 @@ QAbstractAnimation *QDeclarativePauseAnimation::qtAnimation()
 }
 
 /*!
-    \qmlclass ColorAnimation QDeclarativeColorAnimation
+    \qmltype ColorAnimation
+    \instantiates QDeclarativeColorAnimation
   \ingroup qml-animation-transition
     \since 4.7
     \inherits PropertyAnimation
@@ -728,7 +731,8 @@ void QDeclarativeColorAnimation::setTo(const QColor &t)
 
 
 /*!
-    \qmlclass ScriptAction QDeclarativeScriptAction
+    \qmltype ScriptAction
+    \instantiates QDeclarativeScriptAction
     \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
@@ -862,7 +866,8 @@ QAbstractAnimation *QDeclarativeScriptAction::qtAnimation()
 
 
 /*!
-    \qmlclass PropertyAction QDeclarativePropertyAction
+    \qmltype PropertyAction
+    \instantiates QDeclarativePropertyAction
     \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
@@ -1123,7 +1128,8 @@ void QDeclarativePropertyAction::transition(QDeclarativeStateActions &actions,
 }
 
 /*!
-    \qmlclass NumberAnimation QDeclarativeNumberAnimation
+    \qmltype NumberAnimation
+    \instantiates QDeclarativeNumberAnimation
   \ingroup qml-animation-transition
     \since 4.7
     \inherits PropertyAnimation
@@ -1235,7 +1241,8 @@ void QDeclarativeNumberAnimation::setTo(qreal t)
 
 
 /*!
-    \qmlclass Vector3dAnimation QDeclarativeVector3dAnimation
+    \qmltype Vector3dAnimation
+    \instantiates QDeclarativeVector3dAnimation
     \ingroup qml-animation-transition
     \since 4.7
     \inherits PropertyAnimation
@@ -1311,7 +1318,8 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t)
 
 
 /*!
-    \qmlclass RotationAnimation QDeclarativeRotationAnimation
+    \qmltype RotationAnimation
+    \instantiates QDeclarativeRotationAnimation
     \ingroup qml-animation-transition
     \since 4.7
     \inherits PropertyAnimation
@@ -1555,7 +1563,8 @@ QDeclarativeListProperty<QDeclarativeAbstractAnimation> QDeclarativeAnimationGro
 }
 
 /*!
-    \qmlclass SequentialAnimation QDeclarativeSequentialAnimation
+    \qmltype SequentialAnimation
+    \instantiates QDeclarativeSequentialAnimation
   \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
@@ -1629,7 +1638,8 @@ void QDeclarativeSequentialAnimation::transition(QDeclarativeStateActions &actio
 
 
 /*!
-    \qmlclass ParallelAnimation QDeclarativeParallelAnimation
+    \qmltype ParallelAnimation
+    \instantiates QDeclarativeParallelAnimation
   \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
@@ -1743,7 +1753,8 @@ void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int
 }
 
 /*!
-    \qmlclass PropertyAnimation QDeclarativePropertyAnimation
+    \qmltype PropertyAnimation
+    \instantiates QDeclarativePropertyAnimation
   \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
@@ -2432,7 +2443,8 @@ void QDeclarativePropertyAnimation::transition(QDeclarativeStateActions &actions
 }
 
 /*!
-    \qmlclass ParentAnimation QDeclarativeParentAnimation
+    \qmltype ParentAnimation
+    \instantiates QDeclarativeParentAnimation
   \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
@@ -2793,7 +2805,8 @@ QAbstractAnimation *QDeclarativeParentAnimation::qtAnimation()
 }
 
 /*!
-    \qmlclass AnchorAnimation QDeclarativeAnchorAnimation
+    \qmltype AnchorAnimation
+    \instantiates QDeclarativeAnchorAnimation
   \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index 0c1ddc96..40bc448f 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -71,7 +71,8 @@ public:
 };
 
 /*!
-    \qmlclass Behavior QDeclarativeBehavior
+    \qmltype Behavior
+    \instantiates QDeclarativeBehavior
     \ingroup qml-animation-transition
     \since 4.7
     \brief The Behavior element allows you to specify a default animation for a property change.
diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp
index 1675a9d8..3753f23f 100644
--- a/src/declarative/util/qdeclarativebind.cpp
+++ b/src/declarative/util/qdeclarativebind.cpp
@@ -72,7 +72,8 @@ public:
 
 
 /*!
-    \qmlclass Binding QDeclarativeBind
+    \qmltype Binding
+    \instantiates QDeclarativeBind
     \ingroup qml-working-with-data
     \since 4.7
     \brief The Binding element allows arbitrary property bindings to be created.
diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp
index 866fa042..de2a6fcc 100644
--- a/src/declarative/util/qdeclarativeconnections.cpp
+++ b/src/declarative/util/qdeclarativeconnections.cpp
@@ -71,7 +71,8 @@ public:
 };
 
 /*!
-    \qmlclass Connections QDeclarativeConnections
+    \qmltype Connections
+    \instantiates QDeclarativeConnections
     \ingroup qml-utility-elements
     \since 4.7
     \brief A Connections element describes generalized connections to signals.
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index a6720d6e..fc8d4637 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -146,7 +146,8 @@ public:
 QHash<QUrl, QDeclarativeFontObject*> QDeclarativeFontLoaderPrivate::fonts;
 
 /*!
-    \qmlclass FontLoader QDeclarativeFontLoader
+    \qmltype FontLoader
+    \instantiates QDeclarativeFontLoader
   \ingroup qml-utility-elements
     \since 4.7
     \brief The FontLoader element allows fonts to be loaded by name or URL.
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 14de5f63..50018c12 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -86,7 +86,8 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM
 }
 
 /*!
-    \qmlclass ListModel QDeclarativeListModel
+    \qmltype ListModel
+    \instantiates QDeclarativeListModel
     \ingroup qml-working-with-data
     \since 4.7
     \brief The ListModel element defines a free-form list data source.
@@ -874,7 +875,8 @@ bool QDeclarativeListModelParser::definesEmptyList(const QString &s)
 
 
 /*!
-    \qmlclass ListElement QDeclarativeListElement
+    \qmltype ListElement
+    \instantiates QDeclarativeListElement
     \ingroup qml-working-with-data
     \since 4.7
     \brief The ListElement element defines a data item in a ListModel.
diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp
index ec7ff43a..52447f0a 100644
--- a/src/declarative/util/qdeclarativepackage.cpp
+++ b/src/declarative/util/qdeclarativepackage.cpp
@@ -47,7 +47,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Package QDeclarativePackage
+    \qmltype Package
+    \instantiates QDeclarativePackage
     \ingroup qml-working-with-data
     \brief Package provides a collection of named items.
 
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index bcc5a56d..b318668d 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -64,7 +64,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass PropertyChanges QDeclarativePropertyChanges
+    \qmltype PropertyChanges
+    \instantiates QDeclarativePropertyChanges
     \ingroup qml-state-elements
     \since 4.7
     \brief The PropertyChanges element describes new property bindings or values for a state.
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp
index 36402fb1..2fc30c02 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation.cpp
+++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp
@@ -249,7 +249,8 @@ void QSmoothedAnimation::init()
 }
 
 /*!
-    \qmlclass SmoothedAnimation QDeclarativeSmoothedAnimation
+    \qmltype SmoothedAnimation
+    \instantiates QDeclarativeSmoothedAnimation
     \ingroup qml-animation-transition
     \since 4.7
     \inherits NumberAnimation
diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/declarative/util/qdeclarativespringanimation.cpp
index cc810ec3..59a55f30 100644
--- a/src/declarative/util/qdeclarativespringanimation.cpp
+++ b/src/declarative/util/qdeclarativespringanimation.cpp
@@ -234,7 +234,8 @@ void QDeclarativeSpringAnimationPrivate::updateMode()
 }
 
 /*!
-    \qmlclass SpringAnimation QDeclarativeSpringAnimation
+    \qmltype SpringAnimation
+    \instantiates QDeclarativeSpringAnimation
     \ingroup qml-animation-transition
     \inherits NumberAnimation
     \since 4.7
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index 6c152904..605d2633 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -129,7 +129,8 @@ QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObje
 }
 
 /*!
-    \qmlclass State QDeclarativeState
+    \qmltype State
+    \instantiates QDeclarativeState
     \ingroup qml-state-elements
     \since 4.7
     \brief The State element defines configurations of objects and properties.
diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp
index fa5e143c..2fed7bd6 100644
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -92,7 +92,8 @@ public:
 };
 
 /*!
-   \qmlclass StateGroup QDeclarativeStateGroup
+   \qmltype StateGroup
+    \instantiates QDeclarativeStateGroup
    \ingroup qml-state-elements
    \since 4.7
    \brief The StateGroup element provides state support for non-Item elements.
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index 1fc92ac5..a4bf36cc 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -169,7 +169,8 @@ void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, Q
 
 /*!
     \preliminary
-    \qmlclass ParentChange QDeclarativeParentChange
+    \qmltype ParentChange
+    \instantiates QDeclarativeParentChange
     \ingroup qml-state-elements
     \brief The ParentChange element allows you to reparent an Item in a state change.
 
@@ -598,7 +599,8 @@ public:
 };
 
 /*!
-    \qmlclass StateChangeScript QDeclarativeStateChangeScript
+    \qmltype StateChangeScript
+    \instantiates QDeclarativeStateChangeScript
     \ingroup qml-state-elements
     \brief The StateChangeScript element allows you to run a script in a state.
 
@@ -685,7 +687,8 @@ QString QDeclarativeStateChangeScript::typeName() const
 }
 
 /*!
-    \qmlclass AnchorChanges QDeclarativeAnchorChanges
+    \qmltype AnchorChanges
+    \instantiates QDeclarativeAnchorChanges
     \ingroup qml-state-elements
     \brief The AnchorChanges element allows you to change the anchors of an item in a state.
 
diff --git a/src/declarative/util/qdeclarativesystempalette.cpp b/src/declarative/util/qdeclarativesystempalette.cpp
index 134137f2..56f385f8 100644
--- a/src/declarative/util/qdeclarativesystempalette.cpp
+++ b/src/declarative/util/qdeclarativesystempalette.cpp
@@ -57,7 +57,8 @@ public:
 
 
 /*!
-    \qmlclass SystemPalette QDeclarativeSystemPalette
+    \qmltype SystemPalette
+    \instantiates QDeclarativeSystemPalette
     \ingroup qml-utility-elements
     \since 4.7
     \brief The SystemPalette element provides access to the Qt palettes.
diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp
index 2c1efd2e..77a7cc3c 100644
--- a/src/declarative/util/qdeclarativetimer.cpp
+++ b/src/declarative/util/qdeclarativetimer.cpp
@@ -69,7 +69,8 @@ public:
 };
 
 /*!
-    \qmlclass Timer QDeclarativeTimer
+    \qmltype Timer
+    \instantiates QDeclarativeTimer
     \ingroup qml-utility-elements
     \since 4.7
     \brief The Timer item triggers a handler at a specified interval.
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp
index ef4869f9..3a861961 100644
--- a/src/declarative/util/qdeclarativetransition.cpp
+++ b/src/declarative/util/qdeclarativetransition.cpp
@@ -52,7 +52,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Transition QDeclarativeTransition
+    \qmltype Transition
+    \instantiates QDeclarativeTransition
     \ingroup qml-animation-transition
     \since 4.7
     \brief The Transition element defines animated transitions that occur on state changes.
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index 35cc1a4c..b98c178a 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -70,7 +70,8 @@ typedef QPair<int, int> QDeclarativeXmlListRange;
 #define XMLLISTMODEL_CLEAR_ID 0
 
 /*!
-    \qmlclass XmlRole QDeclarativeXmlListModelRole
+    \qmltype XmlRole
+    \instantiates QDeclarativeXmlListModelRole
     \ingroup qml-working-with-data
   \since 4.7
     \brief The XmlRole element allows you to specify a role for an XmlListModel.
@@ -598,7 +599,8 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListProperty<QDecla
 }
 
 /*!
-    \qmlclass XmlListModel QDeclarativeXmlListModel
+    \qmltype XmlListModel
+    \instantiates QDeclarativeXmlListModel
     \ingroup qml-working-with-data
   \since 4.7
     \brief The XmlListModel element is used to specify a read-only model using XPath expressions.