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

-To simplify QDoc, \qmlclass is now \qmltype.
-'\instantiates <C+++ class>' is for the types that are defined in C++.

Change-Id: I29242d33daf7b972d8b86a356b9689638866b950
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Martin Smith <martin.smith@nokia.com>

97 files changed, 288 insertions, 148 deletions

diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index aad7072a19..409c2563f1 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -197,7 +197,8 @@ void QQuickFolderListModelPrivate::_q_sortFinished(const QList<FileProperty> &li
 
 
 /*!
-    \qmlclass FolderListModel QQuickFolderListModel
+    \qmltype FolderListModel
+    \instantiates QQuickFolderListModel
     \ingroup qtquick-models
     \brief The FolderListModel provides a model of the contents of a file system folder.
 
diff --git a/src/imports/testlib/signalspy.qdoc b/src/imports/testlib/signalspy.qdoc
index c294cf266b..8522074674 100644
--- a/src/imports/testlib/signalspy.qdoc
+++ b/src/imports/testlib/signalspy.qdoc
@@ -40,7 +40,8 @@
 ****************************************************************************/
 
 /*!
-    \qmlclass SignalSpy SignalSpy
+    \qmltype SignalSpy
+    \instantiates SignalSpy
     \brief Enables introspection of signal emission
     \ingroup qtquick-utility
     \since 4.8
diff --git a/src/imports/testlib/testcase.qdoc b/src/imports/testlib/testcase.qdoc
index 77cfae140e..5e63570f7a 100644
--- a/src/imports/testlib/testcase.qdoc
+++ b/src/imports/testlib/testcase.qdoc
@@ -40,7 +40,8 @@
 ****************************************************************************/
 
 /*!
-    \qmlclass TestCase TestCase
+    \qmltype TestCase
+    \instantiates TestCase
     \brief Represents a unit test case
     \ingroup qtquick-utility
     \since 4.8
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
index 6914861724..8c0751c91c 100644
--- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
+++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
@@ -83,7 +83,8 @@ typedef QPair<int, int> QQuickXmlListRange;
 */
 
 /*!
-    \qmlclass XmlRole QQuickXmlListModelRole
+    \qmltype XmlRole
+    \instantiates QQuickXmlListModelRole
     \inqmlmodule QtQuick.XmlListModel 2
     \brief For specifying a role to an XmlListModel
     \ingroup qtquick-models
@@ -608,7 +609,8 @@ void QQuickXmlListModelPrivate::clear_role(QQmlListProperty<QQuickXmlListModelRo
 }
 
 /*!
-    \qmlclass XmlListModel QQuickXmlListModel
+    \qmltype XmlListModel
+    \instantiates QQuickXmlListModel
     \inqmlmodule QtQuick.XmlListModel 2
     \brief For specifying a read-only model using XPath expressions
     \ingroup qtquick-models
diff --git a/src/particles/qquickage.cpp b/src/particles/qquickage.cpp
index daccec9418..68719dd0b6 100644
--- a/src/particles/qquickage.cpp
+++ b/src/particles/qquickage.cpp
@@ -43,7 +43,8 @@
 #include "qquickparticleemitter_p.h"
 QT_BEGIN_NAMESPACE
 /*!
-    \qmlclass Age QQuickAgeAffector
+    \qmltype Age
+    \instantiates QQuickAgeAffector
     \inqmlmodule QtQuick.Particles 2
     \inherits Affector
     \brief For altering particle ages
diff --git a/src/particles/qquickangledirection.cpp b/src/particles/qquickangledirection.cpp
index 90631092ae..e4ce0c4fcf 100644
--- a/src/particles/qquickangledirection.cpp
+++ b/src/particles/qquickangledirection.cpp
@@ -48,7 +48,8 @@
 QT_BEGIN_NAMESPACE
 const qreal CONV = 0.017453292519943295;
 /*!
-    \qmlclass AngleDirection QQuickAngleDirection
+    \qmltype AngleDirection
+    \instantiates QQuickAngleDirection
     \inqmlmodule QtQuick.Particles 2
     \ingroup qtquick-particles
     \inherits Direction
diff --git a/src/particles/qquickcumulativedirection.cpp b/src/particles/qquickcumulativedirection.cpp
index 705da0103f..72ca7ef5ca 100644
--- a/src/particles/qquickcumulativedirection.cpp
+++ b/src/particles/qquickcumulativedirection.cpp
@@ -43,7 +43,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass CumulativeDirection QQuickCumulativeDirection
+    \qmltype CumulativeDirection
+    \instantiates QQuickCumulativeDirection
     \inqmlmodule QtQuick.Particles 2
     \inherits Direction
     \brief For specifying a direction made of other directions
diff --git a/src/particles/qquickcustomparticle.cpp b/src/particles/qquickcustomparticle.cpp
index 31b95c41fe..272864e3b4 100644
--- a/src/particles/qquickcustomparticle.cpp
+++ b/src/particles/qquickcustomparticle.cpp
@@ -121,7 +121,8 @@ struct PlainVertices {
 };
 
 /*!
-    \qmlclass CustomParticle QQuickCustomParticle
+    \qmltype CustomParticle
+    \instantiates QQuickCustomParticle
     \inqmlmodule QtQuick.Particles 2
     \inherits ParticlePainter
     \brief For specifying shaders to paint particles
diff --git a/src/particles/qquickdirection.cpp b/src/particles/qquickdirection.cpp
index f5d05ee9bc..44155efe04 100644
--- a/src/particles/qquickdirection.cpp
+++ b/src/particles/qquickdirection.cpp
@@ -43,7 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 /*!
-    \qmlclass Direction QQuickDirection
+    \qmltype Direction
+    \instantiates QQuickDirection
     \inqmlmodule QtQuick.Particles 2
     \brief For specifying a vector space
     \ingroup qtquick-particles
diff --git a/src/particles/qquickellipseextruder.cpp b/src/particles/qquickellipseextruder.cpp
index 5c11dfb82b..3a3e1f5f25 100644
--- a/src/particles/qquickellipseextruder.cpp
+++ b/src/particles/qquickellipseextruder.cpp
@@ -49,7 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 /*!
-    \qmlclass EllipseShape QQuickEllipseExtruder
+    \qmltype EllipseShape
+    \instantiates QQuickEllipseExtruder
     \inqmlmodule QtQuick.Particles 2
     \ingroup qtquick-particles
     \inherits Shape
diff --git a/src/particles/qquickfriction.cpp b/src/particles/qquickfriction.cpp
index 6a54ea7cc7..3b31b0bdb9 100644
--- a/src/particles/qquickfriction.cpp
+++ b/src/particles/qquickfriction.cpp
@@ -42,7 +42,8 @@
 #include "qquickfriction_p.h"
 QT_BEGIN_NAMESPACE
 /*!
-    \qmlclass Friction QQuickFrictionAffector
+    \qmltype Friction
+    \instantiates QQuickFrictionAffector
     \inqmlmodule QtQuick.Particles 2
     \ingroup qtquick-particles
     \inherits Affector
diff --git a/src/particles/qquickgravity.cpp b/src/particles/qquickgravity.cpp
index 4e3cc52498..f11681e53f 100644
--- a/src/particles/qquickgravity.cpp
+++ b/src/particles/qquickgravity.cpp
@@ -44,7 +44,8 @@
 QT_BEGIN_NAMESPACE
 const qreal CONV = 0.017453292520444443;
 /*!
-    \qmlclass Gravity QQuickGravityAffector
+    \qmltype Gravity
+    \instantiates QQuickGravityAffector
     \inqmlmodule QtQuick.Particles 2
     \ingroup qtquick-particles
     \inherits Affector
diff --git a/src/particles/qquickgroupgoal.cpp b/src/particles/qquickgroupgoal.cpp
index 96f9e1bc57..5b8e43339a 100644
--- a/src/particles/qquickgroupgoal.cpp
+++ b/src/particles/qquickgroupgoal.cpp
@@ -48,7 +48,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass GroupGoal QQuickGroupGoalAffector
+    \qmltype GroupGoal
+    \instantiates QQuickGroupGoalAffector
     \inqmlmodule QtQuick.Particles 2
     \ingroup qtquick-particles
     \inherits Affector
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp
index 5803c4b703..b55589e3eb 100644
--- a/src/particles/qquickimageparticle.cpp
+++ b/src/particles/qquickimageparticle.cpp
@@ -584,7 +584,8 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
 }
 
 /*!
-    \qmlclass ImageParticle QQuickImageParticle
+    \qmltype ImageParticle
+    \instantiates QQuickImageParticle
     \inqmlmodule QtQuick.Particles 2
     \inherits ParticlePainter
     \brief For visualizing logical particles using an image
diff --git a/src/particles/qquickitemparticle.cpp b/src/particles/qquickitemparticle.cpp
index d63ecdcaf0..bd4168eac3 100644
--- a/src/particles/qquickitemparticle.cpp
+++ b/src/particles/qquickitemparticle.cpp
@@ -49,7 +49,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass ItemParticle QQuickItemParticle
+    \qmltype ItemParticle
+    \instantiates QQuickItemParticle
     \inqmlmodule QtQuick.Particles 2
     \inherits ParticlePainter
     \brief For specifying a delegate to paint particles
diff --git a/src/particles/qquicklineextruder.cpp b/src/particles/qquicklineextruder.cpp
index 3cf44eabc9..1abe0f0bde 100644
--- a/src/particles/qquicklineextruder.cpp
+++ b/src/particles/qquicklineextruder.cpp
@@ -43,7 +43,8 @@
 #include <cmath>
 
 /*!
-    \qmlclass LineShape QQuickLineExtruder
+    \qmltype LineShape
+    \instantiates QQuickLineExtruder
     \inqmlmodule QtQuick.Particles 2
     \inherits Shape
     \brief Represents a line for affectors and emitters
diff --git a/src/particles/qquickmaskextruder.cpp b/src/particles/qquickmaskextruder.cpp
index 0754f03975..b3112d73da 100644
--- a/src/particles/qquickmaskextruder.cpp
+++ b/src/particles/qquickmaskextruder.cpp
@@ -46,7 +46,8 @@
 #include <QDebug>
 QT_BEGIN_NAMESPACE
 /*!
-    \qmlclass MaskShape QQuickMaskExtruder
+    \qmltype MaskShape
+    \instantiates QQuickMaskExtruder
     \inqmlmodule QtQuick.Particles 2
     \inherits Shape
     \brief For representing an image as a shape to affectors and emitters
diff --git a/src/particles/qquickparticleaffector.cpp b/src/particles/qquickparticleaffector.cpp
index 61396b1579..0ad00cebc3 100644
--- a/src/particles/qquickparticleaffector.cpp
+++ b/src/particles/qquickparticleaffector.cpp
@@ -45,7 +45,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Affector QQuickParticleAffector
+    \qmltype Affector
+    \instantiates QQuickParticleAffector
     \inqmlmodule QtQuick.Particles 2
     \brief Applies alterations to the attributes of logical particles at any
     point in their lifetime
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp
index 72aa0a6909..de5f3d9310 100644
--- a/src/particles/qquickparticleemitter.cpp
+++ b/src/particles/qquickparticleemitter.cpp
@@ -46,7 +46,8 @@ QT_BEGIN_NAMESPACE
 
 
 /*!
-    \qmlclass Emitter QQuickParticleEmitter
+    \qmltype Emitter
+    \instantiates QQuickParticleEmitter
     \inqmlmodule QtQuick.Particles 2
     \brief Emits logical particles
     \ingroup qtquick-particles
diff --git a/src/particles/qquickparticleextruder.cpp b/src/particles/qquickparticleextruder.cpp
index 3a54906112..6d220d4d81 100644
--- a/src/particles/qquickparticleextruder.cpp
+++ b/src/particles/qquickparticleextruder.cpp
@@ -45,7 +45,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Shape QQuickParticleExtruder
+    \qmltype Shape
+    \instantiates QQuickParticleExtruder
     \inqmlmodule QtQuick.Particles 2
     \brief For specifying an area for affectors and emitters
     \ingroup qtquick-particles
diff --git a/src/particles/qquickparticlegroup.cpp b/src/particles/qquickparticlegroup.cpp
index 515f3f04fa..fe6d0873e9 100644
--- a/src/particles/qquickparticlegroup.cpp
+++ b/src/particles/qquickparticlegroup.cpp
@@ -42,7 +42,8 @@
 #include "qquickparticlegroup_p.h"
 
 /*!
-    \qmlclass ParticleGroup QQuickParticleGroup
+    \qmltype ParticleGroup
+    \instantiates QQuickParticleGroup
     \inqmlmodule QtQuick.Particles 2
     \brief For setting attributes on a logical particle group
     \ingroup qtquick-particles
diff --git a/src/particles/qquickparticlepainter.cpp b/src/particles/qquickparticlepainter.cpp
index c27500c2d6..5088a871f9 100644
--- a/src/particles/qquickparticlepainter.cpp
+++ b/src/particles/qquickparticlepainter.cpp
@@ -44,7 +44,8 @@
 #include <QDebug>
 QT_BEGIN_NAMESPACE
 /*!
-    \qmlclass ParticlePainter QQuickParticlePainter
+    \qmltype ParticlePainter
+    \instantiates QQuickParticlePainter
     \inqmlmodule QtQuick.Particles 2
     \inherits ParticlePainter
     \brief For specifying how to paint particles
diff --git a/src/particles/qquickparticlesystem.cpp b/src/particles/qquickparticlesystem.cpp
index 891c50ed44..14694e7b1f 100644
--- a/src/particles/qquickparticlesystem.cpp
+++ b/src/particles/qquickparticlesystem.cpp
@@ -101,7 +101,8 @@ DEFINE_BOOL_CONFIG_OPTION(qmlParticlesDebug, QML_PARTICLES_DEBUG)
 */
 
 /*!
-    \qmlclass ParticleSystem QQuickParticleSystem
+    \qmltype ParticleSystem
+    \instantiates QQuickParticleSystem
     \inqmlmodule QtQuick.Particles 2
     \brief A system which includes particle painter, emitter, and affector types
     \ingroup qtquick-particles
diff --git a/src/particles/qquickpointattractor.cpp b/src/particles/qquickpointattractor.cpp
index 9d1cb102b9..88f1f9eded 100644
--- a/src/particles/qquickpointattractor.cpp
+++ b/src/particles/qquickpointattractor.cpp
@@ -44,7 +44,8 @@
 #include <QDebug>
 QT_BEGIN_NAMESPACE
 /*!
-    \qmlclass Attractor QQuickAttractorAffector
+    \qmltype Attractor
+    \instantiates QQuickAttractorAffector
     \inqmlmodule QtQuick.Particles 2
     \ingroup qtquick-particles
     \inherits Affector
diff --git a/src/particles/qquickpointdirection.cpp b/src/particles/qquickpointdirection.cpp
index de9b777300..c7c37993ac 100644
--- a/src/particles/qquickpointdirection.cpp
+++ b/src/particles/qquickpointdirection.cpp
@@ -45,7 +45,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass PointDirection QQuickPointDirection
+    \qmltype PointDirection
+    \instantiates QQuickPointDirection
     \inqmlmodule QtQuick.Particles 2
     \ingroup qtquick-particles
     \inherits Direction
diff --git a/src/particles/qquickrectangleextruder.cpp b/src/particles/qquickrectangleextruder.cpp
index f527bb9ee3..692906b13a 100644
--- a/src/particles/qquickrectangleextruder.cpp
+++ b/src/particles/qquickrectangleextruder.cpp
@@ -45,7 +45,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass RectangleShape QQuickRectangleExtruder
+    \qmltype RectangleShape
+    \instantiates QQuickRectangleExtruder
     \inqmlmodule QtQuick.Particles 2
     \brief For specifying an area for affectors and emitter
     \ingroup qtquick-particles
diff --git a/src/particles/qquickspritegoal.cpp b/src/particles/qquickspritegoal.cpp
index e051efb20c..f40b4d18c9 100644
--- a/src/particles/qquickspritegoal.cpp
+++ b/src/particles/qquickspritegoal.cpp
@@ -48,7 +48,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass SpriteGoal QQuickSpriteGoalAffector
+    \qmltype SpriteGoal
+    \instantiates QQuickSpriteGoalAffector
     \inqmlmodule QtQuick.Particles 2
     \ingroup qtquick-images-sprites
     \inherits Affector
diff --git a/src/particles/qquicktargetdirection.cpp b/src/particles/qquicktargetdirection.cpp
index dfbe4c7a99..85bfde0fbe 100644
--- a/src/particles/qquicktargetdirection.cpp
+++ b/src/particles/qquicktargetdirection.cpp
@@ -46,7 +46,8 @@
 
 QT_BEGIN_NAMESPACE
 /*!
-    \qmlclass TargetDirection QQuickTargetDirection
+    \qmltype TargetDirection
+    \instantiates QQuickTargetDirection
     \inqmlmodule QtQuick.Particles 2
     \ingroup qtquick-particles
     \inherits Direction
diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp
index 86d0c16b8b..919bae6fbb 100644
--- a/src/particles/qquicktrailemitter.cpp
+++ b/src/particles/qquicktrailemitter.cpp
@@ -46,7 +46,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass TrailEmitter QQuickTrailEmitter
+    \qmltype TrailEmitter
+    \instantiates QQuickTrailEmitter
     \inqmlmodule QtQuick.Particles 2
     \inherits QQuickParticleEmitter
     \brief Emits logical particles from other logical particles
diff --git a/src/particles/qquickturbulence.cpp b/src/particles/qquickturbulence.cpp
index b92a2ac1c5..982b11b6ff 100644
--- a/src/particles/qquickturbulence.cpp
+++ b/src/particles/qquickturbulence.cpp
@@ -47,7 +47,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Turbulence QQuickTurbulenceAffector
+    \qmltype Turbulence
+    \instantiates QQuickTurbulenceAffector
     \inqmlmodule QtQuick.Particles 2
     \ingroup qtquick-particles
     \inherits Affector
diff --git a/src/particles/qquickv8particledata.cpp b/src/particles/qquickv8particledata.cpp
index 296797f606..80dec6848c 100644
--- a/src/particles/qquickv8particledata.cpp
+++ b/src/particles/qquickv8particledata.cpp
@@ -46,7 +46,7 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Particle
+    \qmltype Particle
     \inqmlmodule QtQuick.Particles 2
     \brief Represents particles manipulated by emitters and affectors
     \ingroup qtquick-particles
diff --git a/src/particles/qquickwander.cpp b/src/particles/qquickwander.cpp
index a7e6c8db04..e8e810dcf7 100644
--- a/src/particles/qquickwander.cpp
+++ b/src/particles/qquickwander.cpp
@@ -43,7 +43,8 @@
 #include "qquickparticlesystem_p.h"//for ParticlesVertices
 QT_BEGIN_NAMESPACE
 /*!
-    \qmlclass Wander QQuickWanderAffector
+    \qmltype Wander
+    \instantiates QQuickWanderAffector
     \inqmlmodule QtQuick.Particles 2
     \ingroup qtquick-particles
     \inherits Affector
diff --git a/src/qml/doc/src/javascript/date.qdoc b/src/qml/doc/src/javascript/date.qdoc
index f1cff3dfff..66b05071d0 100644
--- a/src/qml/doc/src/javascript/date.qdoc
+++ b/src/qml/doc/src/javascript/date.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \qmlclass Date
+    \qmltype Date
     \inqmlmodule QtQuick 2
     \brief Provides date functions
 
diff --git a/src/qml/doc/src/javascript/number.qdoc b/src/qml/doc/src/javascript/number.qdoc
index 47dc0338c0..9588b71a04 100644
--- a/src/qml/doc/src/javascript/number.qdoc
+++ b/src/qml/doc/src/javascript/number.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \qmlclass Number
+    \qmltype Number
     \inqmlmodule QtQuick 2
     \brief The Number object provides represents a number value
 
diff --git a/src/qml/doc/src/javascript/string.qdoc b/src/qml/doc/src/javascript/string.qdoc
index b9a6ac1051..2a82b16a81 100644
--- a/src/qml/doc/src/javascript/string.qdoc
+++ b/src/qml/doc/src/javascript/string.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \qmlclass String
+    \qmltype String
     \inqmlmodule QtQuick 2
     \brief The String object represents a string value
 
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index ac3eee8d05..b1715f1c70 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -190,7 +190,8 @@ static inline QString buildTypeNameForDebug(const QMetaObject *metaObject)
 */
 
 /*!
-    \qmlclass Component QQmlComponent
+    \qmltype Component
+    \instantiates QQmlComponent
     \ingroup qml-utility-elements
     \since 4.7
     \inqmlmodule QtQuick 2
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index f9b261b314..72c1c35244 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -109,7 +109,8 @@ void qmlRegisterBaseTypes(const char *uri, int versionMajor, int versionMinor)
 }
 
 /*!
-  \qmlclass QtObject QObject
+  \qmltype QtObject
+    \instantiates QObject
   \inqmlmodule QtQuick 2
   \ingroup qml-utility-elements
   \since 4.7
@@ -241,7 +242,8 @@ QQmlImageProviderBase::~QQmlImageProviderBase()
 
 
 /*!
-\qmlclass Qt QQmlEnginePrivate
+\qmltype Qt
+    \instantiates QQmlEnginePrivate
   \ingroup qml-utility-elements
 \brief The QML global Qt object provides useful enums and functions from Qt.
 
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index 9a2ec6f0e3..e323c804a1 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -764,7 +764,8 @@ QV8LocaleDataDeletable::~QV8LocaleDataDeletable()
 V8_DEFINE_EXTENSION(QV8LocaleDataDeletable, localeV8Data);
 
 /*!
-    \qmlclass Locale QQmlLocale
+    \qmltype Locale
+    \instantiates QQmlLocale
     \inqmlmodule QtQuick 2
     \brief Provides locale specific properties and formatted data
 
diff --git a/src/qml/qml/qquicklistmodel.cpp b/src/qml/qml/qquicklistmodel.cpp
index 11aa372ee5..a3e2456fb7 100644
--- a/src/qml/qml/qquicklistmodel.cpp
+++ b/src/qml/qml/qquicklistmodel.cpp
@@ -1423,7 +1423,8 @@ QQuickListModelParser::ListInstruction *QQuickListModelParser::ListModelData::in
 }
 
 /*!
-    \qmlclass ListModel QQuickListModel
+    \qmltype ListModel
+    \instantiates QQuickListModel
     \inqmlmodule QtQuick 2
     \brief Defines a free-form list data source
     \ingroup qtquick-models
@@ -2521,7 +2522,8 @@ bool QQuickListModelParser::definesEmptyList(const QString &s)
 
 
 /*!
-    \qmlclass ListElement QQuickListElement
+    \qmltype ListElement
+    \instantiates QQuickListElement
     \inqmlmodule QtQuick 2
     \brief Defines a data item in a ListModel
     \ingroup qtquick-models
diff --git a/src/qml/qml/qquickworkerscript.cpp b/src/qml/qml/qquickworkerscript.cpp
index 84cbdbba3f..96ddf908f3 100644
--- a/src/qml/qml/qquickworkerscript.cpp
+++ b/src/qml/qml/qquickworkerscript.cpp
@@ -560,7 +560,8 @@ void QQuickWorkerScriptEngine::run()
 
 
 /*!
-    \qmlclass WorkerScript QQuickWorkerScript
+    \qmltype WorkerScript
+    \instantiates QQuickWorkerScript
     \ingroup qtquick-threading
     \inqmlmodule QtQuick 2
     \brief Enables the use of threads in a Qt Quick application
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 47c8b4f148..939e7b4fba 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -202,7 +202,8 @@ QQuickCanvasItemPrivate::~QQuickCanvasItemPrivate()
 
 
 /*!
-    \qmlclass Canvas QQuickCanvasItem
+    \qmltype Canvas
+    \instantiates QQuickCanvasItem
     \inqmlmodule QtQuick 2
     \since QtQuick 2.0
     \inherits Item
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 2a99a2eb58..f448c3fdfb 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -72,7 +72,8 @@
 
 QT_BEGIN_NAMESPACE
 /*!
-    \qmlclass Context2D QQuickContext2D
+    \qmltype Context2D
+    \instantiates QQuickContext2D
     \inqmlmodule QtQuick 2
     \ingroup qtquick-canvas
     \since QtQuick 2.0
@@ -2203,7 +2204,7 @@ static v8::Handle<v8::Value> ctx2d_strokeText(const v8::Arguments &args)
     return args.This();
 }
 /*!
-  \qmlclass TextMetrics
+  \qmltype TextMetrics
     \inqmlmodule QtQuick 2
     \since QtQuick 2.0
     \ingroup qtquick-canvas
@@ -2406,7 +2407,7 @@ static v8::Handle<v8::Value> ctx2d_drawImage(const v8::Arguments &args)
 
 // pixel manipulation
 /*!
-    \qmlclass CanvasImageData
+    \qmltype CanvasImageData
     \inqmlmodule QtQuick 2
     \ingroup qtquick-canvas
     \brief Contains image pixel data in RGBA order
@@ -2459,7 +2460,7 @@ v8::Handle<v8::Value> ctx2d_imageData_data(v8::Local<v8::String>, const v8::Acce
 }
 
 /*!
-    \qmlclass CanvasPixelArray
+    \qmltype CanvasPixelArray
     \inqmlmodule QtQuick 2
     \ingroup qtquick-canvas
     \brief Provides ordered and indexed access to the components of each pixel in image data
@@ -2698,7 +2699,7 @@ static v8::Handle<v8::Value> ctx2d_putImageData(const v8::Arguments &args)
 }
 
 /*!
-    \qmlclass CanvasGradient
+    \qmltype CanvasGradient
     \inqmlmodule QtQuick 2
     \since QtQuick 2.0
     \ingroup qtquick-canvas
diff --git a/src/quick/items/qquickaccessibleattached.cpp b/src/quick/items/qquickaccessibleattached.cpp
index 1cccc01b74..eb2a69a4e4 100644
--- a/src/quick/items/qquickaccessibleattached.cpp
+++ b/src/quick/items/qquickaccessibleattached.cpp
@@ -48,7 +48,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Accessible QQuickAccessibleAttached
+    \qmltype Accessible
+    \instantiates QQuickAccessibleAttached
     \brief Enables accessibility of QML items
 
     \inqmlmodule QtQuick 2
diff --git a/src/quick/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp
index d10148b66e..9f18d875f2 100644
--- a/src/quick/items/qquickanimatedimage.cpp
+++ b/src/quick/items/qquickanimatedimage.cpp
@@ -53,7 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 /*!
-    \qmlclass AnimatedImage QQuickAnimatedImage
+    \qmltype AnimatedImage
+    \instantiates QQuickAnimatedImage
     \inqmlmodule QtQuick 2
     \inherits Image
     \brief Plays animations stored as a series of images
diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp
index 8fa4acc67c..c236d3a84f 100644
--- a/src/quick/items/qquickanimatedsprite.cpp
+++ b/src/quick/items/qquickanimatedsprite.cpp
@@ -208,7 +208,8 @@ struct AnimatedSpriteVertices {
 };
 
 /*!
-    \qmlclass AnimatedSprite QQuickAnimatedSprite
+    \qmltype AnimatedSprite
+    \instantiates QQuickAnimatedSprite
     \inqmlmodule QtQuick 2
     \inherits Item
     \ingroup qtquick-visual
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp
index a9f154bcb7..bb15f3623b 100644
--- a/src/quick/items/qquickborderimage.cpp
+++ b/src/quick/items/qquickborderimage.cpp
@@ -54,7 +54,8 @@ QT_BEGIN_NAMESPACE
 
 
 /*!
-    \qmlclass BorderImage QQuickBorderImage
+    \qmltype BorderImage
+    \instantiates QQuickBorderImage
     \inqmlmodule QtQuick 2
     \brief Paints a border based on an image
     \inherits Item
diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index 972b9135c2..84234b0d91 100644
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -108,7 +108,8 @@ public:
 };
 
 /*!
-    \qmlclass Drag QQuickDrag
+    \qmltype Drag
+    \instantiates QQuickDrag
     \inqmlmodule QtQuick 2
     \ingroup qtquick-input
     \brief For specifying drag and drop events for moved Items
diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp
index 1892a433f3..4f93528a2b 100644
--- a/src/quick/items/qquickdroparea.cpp
+++ b/src/quick/items/qquickdroparea.cpp
@@ -91,7 +91,8 @@ QQuickDropAreaPrivate::~QQuickDropAreaPrivate()
 }
 
 /*!
-    \qmlclass DropArea QQuickDropArea
+    \qmltype DropArea
+    \instantiates QQuickDropArea
     \inqmlmodule QtQuick 2
     \ingroup qtquick-input
     \brief For specifying drag and drop handling in an area
@@ -327,7 +328,8 @@ void QQuickDropArea::dropEvent(QDropEvent *event)
 }
 
 /*!
-    \qmlclass DragEvent QQuickDragEvent
+    \qmltype DragEvent
+    \instantiates QQuickDragEvent
     \inqmlmodule QtQuick 2
     \ingroup qtquick-input-events
     \brief Provides information about a drag event
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index 01f75a74fd..647c522829 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -44,7 +44,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass KeyEvent QQuickKeyEvent
+    \qmltype KeyEvent
+    \instantiates QQuickKeyEvent
     \inqmlmodule QtQuick 2
     \ingroup qtquick-input-events
 
@@ -148,7 +149,8 @@ Item {
 
 
 /*!
-    \qmlclass MouseEvent QQuickMouseEvent
+    \qmltype MouseEvent
+    \instantiates QQuickMouseEvent
     \inqmlmodule QtQuick 2
     \ingroup qtquick-input-events
 
@@ -246,7 +248,8 @@ Item {
 
 
 /*!
-    \qmlclass WheelEvent QQuickWheelEvent
+    \qmltype WheelEvent
+    \instantiates QQuickWheelEvent
     \inqmlmodule QtQuick 2
     \ingroup qtquick-input-events
     \brief Provides information about a mouse wheel event
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 001abe3ace..1f2f228e31 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -584,7 +584,8 @@ is finished.
 */
 
 /*!
-    \qmlclass Flickable QQuickFlickable
+    \qmltype Flickable
+    \instantiates QQuickFlickable
     \inqmlmodule QtQuick 2
     \ingroup qtquick-input
     \ingroup qtquick-containers
diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp
index 75575598fa..b4e3a385f4 100644
--- a/src/quick/items/qquickflipable.cpp
+++ b/src/quick/items/qquickflipable.cpp
@@ -88,7 +88,8 @@ public:
 };
 
 /*!
-    \qmlclass Flipable QQuickFlipable
+    \qmltype Flipable
+    \instantiates QQuickFlipable
     \inqmlmodule QtQuick 2
     \inherits Item
     \ingroup qtquick-input
diff --git a/src/quick/items/qquickfocusscope.cpp b/src/quick/items/qquickfocusscope.cpp
index 14a85629ea..871a2cf193 100644
--- a/src/quick/items/qquickfocusscope.cpp
+++ b/src/quick/items/qquickfocusscope.cpp
@@ -44,7 +44,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass FocusScope QQuickFocusScope
+    \qmltype FocusScope
+    \instantiates QQuickFocusScope
     \inqmlmodule QtQuick 2
     \ingroup qtquick-input
 
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index 518692a813..f60e3f3a5c 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -1131,7 +1131,8 @@ bool QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
 
 //----------------------------------------------------------------------------
 /*!
-    \qmlclass GridView QQuickGridView
+    \qmltype GridView
+    \instantiates QQuickGridView
     \inqmlmodule QtQuick 2
     \ingroup qtquick-views
 
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index 4279e27832..9d2babbccf 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -92,7 +92,8 @@ QQuickImagePrivate::QQuickImagePrivate()
 }
 
 /*!
-    \qmlclass Image QQuickImage
+    \qmltype Image
+    \instantiates QQuickImage
     \inqmlmodule QtQuick 2
     \ingroup qtquick-visual
     \inherits Item
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 5930b5fb0b..f360ca5270 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -130,7 +130,8 @@ void QQuickItemPrivate::registerAccessorProperties()
 }
 
 /*!
-    \qmlclass Transform QQuickTransform
+    \qmltype Transform
+    \instantiates QQuickTransform
     \inqmlmodule QtQuick 2
     \ingroup qtquick-visual-transforms
     \brief For specifying advanced transformations on Items
@@ -152,7 +153,8 @@ void QQuickItemPrivate::registerAccessorProperties()
 */
 
 /*!
-    \qmlclass Translate QQuickTranslate
+    \qmltype Translate
+    \instantiates QQuickTranslate
     \inqmlmodule QtQuick 2
     \ingroup qtquick-visual-transforms
     \brief Provides a way to move an Item without changing its x or y properties
@@ -194,7 +196,8 @@ void QQuickItemPrivate::registerAccessorProperties()
 */
 
 /*!
-    \qmlclass Scale QQuickScale
+    \qmltype Scale
+    \instantiates QQuickScale
     \inqmlmodule QtQuick 2
     \ingroup qtquick-visual-transforms
     \brief Provides a way to scale an Item
@@ -236,7 +239,8 @@ void QQuickItemPrivate::registerAccessorProperties()
 */
 
 /*!
-    \qmlclass Rotation QQuickRotation
+    \qmltype Rotation
+    \instantiates QQuickRotation
     \inqmlmodule QtQuick 2
     \ingroup qtquick-visual-transforms
     \brief Provides a way to rotate an Item
@@ -504,7 +508,8 @@ void QQuickItemKeyFilter::componentComplete()
     if (m_next) m_next->componentComplete();
 }
 /*!
-    \qmlclass KeyNavigation QQuickKeyNavigationAttached
+    \qmltype KeyNavigation
+    \instantiates QQuickKeyNavigationAttached
     \inqmlmodule QtQuick 2
     \ingroup qtquick-input
     \brief Supports key navigation by arrow keys
@@ -918,7 +923,8 @@ bool QQuickKeysAttached::isConnected(const char *signalName)
 }
 
 /*!
-    \qmlclass Keys QQuickKeysAttached
+    \qmltype Keys
+    \instantiates QQuickKeysAttached
     \inqmlmodule QtQuick 2
     \ingroup qtquick-input
     \brief Provides key handling to Items
@@ -1464,7 +1470,8 @@ QQuickKeysAttached *QQuickKeysAttached::qmlAttachedProperties(QObject *obj)
 }
 
 /*!
-    \qmlclass LayoutMirroring QQuickLayoutMirroringAttached
+    \qmltype LayoutMirroring
+    \instantiates QQuickLayoutMirroringAttached
     \inqmlmodule QtQuick 2
     \ingroup qtquick-positioners
     \ingroup qml-utility-elements
@@ -1721,7 +1728,8 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus)
 */
 
 /*!
-    \qmlclass Item QQuickItem
+    \qmltype Item
+    \instantiates QQuickItem
     \inherits QtObject
     \inqmlmodule QtQuick 2
     \ingroup qtquick-visual
diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp
index dd8254d748..078fb3f37a 100644
--- a/src/quick/items/qquickitemanimation.cpp
+++ b/src/quick/items/qquickitemanimation.cpp
@@ -55,7 +55,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass ParentAnimation QQuickParentAnimation
+    \qmltype ParentAnimation
+    \instantiates QQuickParentAnimation
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-properties
     \since QtQuick 2.0
@@ -415,7 +416,8 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act
 }
 
 /*!
-    \qmlclass AnchorAnimation QQuickAnchorAnimation
+    \qmltype AnchorAnimation
+    \instantiates QQuickAnchorAnimation
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-properties
     \inherits Animation
@@ -558,7 +560,8 @@ QAbstractAnimationJob* QQuickAnchorAnimation::transition(QQuickStateActions &act
 }
 
 /*!
-    \qmlclass PathAnimation QQuickPathAnimation
+    \qmltype PathAnimation
+    \instantiates QQuickPathAnimation
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-properties
     \inherits Animation
diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp
index bfa68ebbfb..6fd5404cd9 100644
--- a/src/quick/items/qquickitemviewtransition.cpp
+++ b/src/quick/items/qquickitemviewtransition.cpp
@@ -566,7 +566,8 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent)
 {
 }
 /*!
-    \qmlclass ViewTransition QQuickViewTransitionAttached
+    \qmltype ViewTransition
+    \instantiates QQuickViewTransitionAttached
     \inqmlmodule QtQuick 2
     \ingroup qtquick-transitions-animations
     \brief Specifies items under transition in a view
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 61574ee1b1..f4f6efee19 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -1648,7 +1648,8 @@ bool QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
 //----------------------------------------------------------------------------
 
 /*!
-    \qmlclass ListView QQuickListView
+    \qmltype ListView
+    \instantiates QQuickListView
     \inqmlmodule QtQuick 2
     \ingroup qtquick-views
     \inherits Flickable
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index 233e92e3c5..52338af07a 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -158,7 +158,8 @@ qreal QQuickLoaderPrivate::getImplicitHeight() const
 }
 
 /*!
-    \qmlclass Loader QQuickLoader
+    \qmltype Loader
+    \instantiates QQuickLoader
     \inqmlmodule QtQuick 2
     \ingroup qtquick-dynamic
     \inherits Item
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index 85a224fc93..336058cfdf 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -324,7 +324,8 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i
 }
 
 /*!
-    \qmlclass MouseArea QQuickMouseArea
+    \qmltype MouseArea
+    \instantiates QQuickMouseArea
     \inqmlmodule QtQuick 2
     \ingroup qtquick-input
     \brief Enables simple mouse handling
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp
index 15e60582b1..f6f48e493f 100644
--- a/src/quick/items/qquickmultipointtoucharea.cpp
+++ b/src/quick/items/qquickmultipointtoucharea.cpp
@@ -53,7 +53,8 @@ QT_BEGIN_NAMESPACE
 DEFINE_BOOL_CONFIG_OPTION(qmlVisualTouchDebugging, QML_VISUAL_TOUCH_DEBUGGING)
 
 /*!
-    \qmlclass TouchPoint QQuickTouchPoint
+    \qmltype TouchPoint
+    \instantiates QQuickTouchPoint
     \inqmlmodule QtQuick 2
     \ingroup qtquick-input-events
     \brief Describes a touch point in a MultiPointTouchArea
@@ -222,7 +223,8 @@ void QQuickTouchPoint::setSceneY(qreal sceneY)
 }
 
 /*!
-    \qmlclass MultiPointTouchArea QQuickMultiPointTouchArea
+    \qmltype MultiPointTouchArea
+    \instantiates QQuickMultiPointTouchArea
     \inqmlmodule QtQuick 2
     \inherits Item
     \ingroup qtquick-input
diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp
index b5304c3361..00443fb013 100644
--- a/src/quick/items/qquickpathview.cpp
+++ b/src/quick/items/qquickpathview.cpp
@@ -451,7 +451,8 @@ void QQuickPathViewPrivate::setDragging(bool d)
 }
 
 /*!
-    \qmlclass PathView QQuickPathView
+    \qmltype PathView
+    \instantiates QQuickPathView
     \inqmlmodule QtQuick 2
     \ingroup qtquick-paths
     \ingroup qtquick-views
diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp
index d167d75efb..9384ef0fea 100644
--- a/src/quick/items/qquickpincharea.cpp
+++ b/src/quick/items/qquickpincharea.cpp
@@ -52,7 +52,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass PinchEvent QQuickPinchEvent
+    \qmltype PinchEvent
+    \instantiates QQuickPinchEvent
     \inqmlmodule QtQuick 2
     \ingroup qtquick-input-events
     \brief For specifying information about a pinch event
@@ -161,7 +162,8 @@ QQuickPinchAreaPrivate::~QQuickPinchAreaPrivate()
 }
 
 /*!
-    \qmlclass PinchArea QQuickPinchArea
+    \qmltype PinchArea
+    \instantiates QQuickPinchArea
     \inqmlmodule QtQuick 2
     \ingroup qtquick-input
     \inherits Item
diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp
index fa0d194855..333cd8f3ff 100644
--- a/src/quick/items/qquickpositioners.cpp
+++ b/src/quick/items/qquickpositioners.cpp
@@ -493,7 +493,8 @@ void QQuickBasePositioner::updateAttachedProperties(QQuickPositionerAttached *sp
 }
 
 /*!
-    \qmlclass Positioner QQuickPositionerAttached
+    \qmltype Positioner
+    \instantiates QQuickPositionerAttached
     \inqmlmodule QtQuick 2
     \ingroup qtquick-positioners
     \brief Provides attached properties that contain details on where an item exists in a positioner
@@ -575,7 +576,8 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem)
 }
 
 /*!
-    \qmlclass Column QQuickColumn
+    \qmltype Column
+    \instantiates QQuickColumn
     \inqmlmodule QtQuick 2
     \inherits Item
     \ingroup qtquick-positioners
@@ -743,7 +745,8 @@ void QQuickColumn::reportConflictingAnchors()
     }
 }
 /*!
-    \qmlclass Row QQuickRow
+    \qmltype Row
+    \instantiates QQuickRow
     \inqmlmodule QtQuick 2
     \inherits Item
     \ingroup qtquick-positioners
@@ -974,7 +977,8 @@ void QQuickRow::reportConflictingAnchors()
 }
 
 /*!
-    \qmlclass Grid QQuickGrid
+    \qmltype Grid
+    \instantiates QQuickGrid
     \inqmlmodule QtQuick 2
     \inherits Item
     \ingroup qtquick-positioners
@@ -1415,7 +1419,8 @@ void QQuickGrid::reportConflictingAnchors()
 }
 
 /*!
-    \qmlclass Flow QQuickFlow
+    \qmltype Flow
+    \instantiates QQuickFlow
     \inqmlmodule QtQuick 2
     \inherits Item
     \ingroup qtquick-positioners
diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp
index ca4a9f55cc..542f544eef 100644
--- a/src/quick/items/qquickrectangle.cpp
+++ b/src/quick/items/qquickrectangle.cpp
@@ -128,7 +128,8 @@ bool QQuickPen::isValid() const
 }
 
 /*!
-    \qmlclass GradientStop QQuickGradientStop
+    \qmltype GradientStop
+    \instantiates QQuickGradientStop
     \inqmlmodule QtQuick 2
     \ingroup qtquick-visual-utility
     \brief Defines the color at a position in a Gradient
@@ -179,7 +180,8 @@ void QQuickGradientStop::updateGradient()
 }
 
 /*!
-    \qmlclass Gradient QQuickGradient
+    \qmltype Gradient
+    \instantiates QQuickGradient
     \inqmlmodule QtQuick 2
     \ingroup qtquick-visual-utility
     \brief Defines a gradient fill
@@ -261,7 +263,8 @@ void QQuickGradient::doUpdate()
 int QQuickRectanglePrivate::doUpdateSlotIdx = -1;
 
 /*!
-    \qmlclass Rectangle QQuickRectangle
+    \qmltype Rectangle
+    \instantiates QQuickRectangle
     \inqmlmodule QtQuick 2
     \inherits Item
     \ingroup qtquick-visual
diff --git a/src/quick/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp
index 61b1392a91..943375d0fa 100644
--- a/src/quick/items/qquickrepeater.cpp
+++ b/src/quick/items/qquickrepeater.cpp
@@ -61,7 +61,8 @@ QQuickRepeaterPrivate::~QQuickRepeaterPrivate()
 }
 
 /*!
-    \qmlclass Repeater QQuickRepeater
+    \qmltype Repeater
+    \instantiates QQuickRepeater
     \inqmlmodule QtQuick 2
     \ingroup qtquick-models
     \ingroup qtquick-positioning
diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
index 32b0d321db..f795d7796e 100644
--- a/src/quick/items/qquickscreen.cpp
+++ b/src/quick/items/qquickscreen.cpp
@@ -50,7 +50,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Screen QQuickScreenAttached
+    \qmltype Screen
+    \instantiates QQuickScreenAttached
     \inqmlmodule QtQuick.Window 2
     \ingroup qtquick-visual-utility
     \brief The Screen attached object provides information about the Screen an Item is displayed on.
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp
index 0b8189fa33..9ab926d627 100644
--- a/src/quick/items/qquickshadereffect.cpp
+++ b/src/quick/items/qquickshadereffect.cpp
@@ -533,7 +533,8 @@ void QQuickShaderEffectCommon::propertyChanged(QQuickItem *item, int mappedId,
 
 
 /*!
-    \qmlclass ShaderEffect QQuickShaderEffect
+    \qmltype ShaderEffect
+    \instantiates QQuickShaderEffect
     \inqmlmodule QtQuick 2
     \inherits Item
     \ingroup qtquick-effects
diff --git a/src/quick/items/qquickshadereffectmesh.cpp b/src/quick/items/qquickshadereffectmesh.cpp
index 52a3a0c375..7264286fbe 100644
--- a/src/quick/items/qquickshadereffectmesh.cpp
+++ b/src/quick/items/qquickshadereffectmesh.cpp
@@ -51,7 +51,8 @@ QQuickShaderEffectMesh::QQuickShaderEffectMesh(QObject *parent)
 }
 
 /*!
-    \qmlclass GridMesh QQuickGridMesh
+    \qmltype GridMesh
+    \instantiates QQuickGridMesh
     \inqmlmodule QtQuick 2
     \ingroup qtquick-effects
     \brief Defines a mesh with vertices arranged in a grid
diff --git a/src/quick/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp
index 5ccd7bc247..2bb2aa6604 100644
--- a/src/quick/items/qquickshadereffectsource.cpp
+++ b/src/quick/items/qquickshadereffectsource.cpp
@@ -457,7 +457,8 @@ QImage QQuickShaderEffectTexture::toImage() const
 }
 
 /*!
-    \qmlclass ShaderEffectSource QQuickShaderEffectSource
+    \qmltype ShaderEffectSource
+    \instantiates QQuickShaderEffectSource
     \since 5.0
     \inherits Item
     \ingroup qtquick-effects
diff --git a/src/quick/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp
index 8d56612a6c..d86b810d4a 100644
--- a/src/quick/items/qquicksprite.cpp
+++ b/src/quick/items/qquicksprite.cpp
@@ -46,7 +46,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Sprite QQuickSprite
+    \qmltype Sprite
+    \instantiates QQuickSprite
     \inqmlmodule QtQuick 2
     \ingroup qtquick-visual-utility
     \brief Specifies sprite animations
diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp
index 62ab20b35e..525984ccbd 100644
--- a/src/quick/items/qquickspritesequence.cpp
+++ b/src/quick/items/qquickspritesequence.cpp
@@ -207,7 +207,8 @@ struct SpriteVertices {
 };
 
 /*!
-    \qmlclass SpriteSequence QQuickSpriteSequence
+    \qmltype SpriteSequence
+    \instantiates QQuickSpriteSequence
     \inqmlmodule QtQuick 2
     \ingroup qtquick-visual-utility
     \inherits Item
diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp
index 47e4087a57..7ef1cf8f77 100644
--- a/src/quick/items/qquickstateoperations.cpp
+++ b/src/quick/items/qquickstateoperations.cpp
@@ -147,7 +147,8 @@ void QQuickParentChangePrivate::doChange(QQuickItem *targetParent, QQuickItem *s
 }
 
 /*!
-    \qmlclass ParentChange QQuickParentChange
+    \qmltype ParentChange
+    \instantiates QQuickParentChange
     \inqmlmodule QtQuick 2
     \ingroup qtquick-states
     \brief Specifies how to reparent an Item in a state change
@@ -558,7 +559,8 @@ void QQuickParentChange::rewind()
 }
 
 /*!
-    \qmlclass AnchorChanges QQuickAnchorChanges
+    \qmltype AnchorChanges
+    \instantiates QQuickAnchorChanges
     \inqmlmodule QtQuick 2
     \ingroup qtquick-states
     \brief Specifies how to change the anchors of an item in a state
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 9c210d4d90..87d389b86f 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -1218,7 +1218,8 @@ void QQuickTextPrivate::ensureDoc()
 }
 
 /*!
-    \qmlclass Text QQuickText
+    \qmltype Text
+    \instantiates QQuickText
     \inqmlmodule QtQuick 2
     \ingroup qtquick-visual
     \inherits Item
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index 4422d6aee6..73d9b672bf 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -65,7 +65,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass TextEdit QQuickTextEdit
+    \qmltype TextEdit
+    \instantiates QQuickTextEdit
     \inqmlmodule QtQuick 2
     \ingroup qtquick-visual
     \ingroup qtquick-input
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 4dbd39e826..73e329b4c1 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -66,7 +66,8 @@ QT_BEGIN_NAMESPACE
 DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
 
 /*!
-    \qmlclass TextInput QQuickTextInput
+    \qmltype TextInput
+    \instantiates QQuickTextInput
     \inqmlmodule QtQuick 2
     \ingroup qtquick-visual
     \ingroup qtquick-input
@@ -879,7 +880,8 @@ void QQuickTextInput::setAutoScroll(bool b)
 #ifndef QT_NO_VALIDATOR
 
 /*!
-    \qmlclass IntValidator QIntValidator
+    \qmltype IntValidator
+    \instantiates QIntValidator
     \inqmlmodule QtQuick 2
     \ingroup qtquick-text-utility
     \brief Defines a validator for integer values
@@ -942,7 +944,8 @@ void QQuickIntValidator::resetLocaleName()
 */
 
 /*!
-    \qmlclass DoubleValidator QDoubleValidator
+    \qmltype DoubleValidator
+    \instantiates QDoubleValidator
     \inqmlmodule QtQuick 2
     \ingroup qtquick-text-utility
     \brief Defines a validator for non-integer numbers
@@ -1035,7 +1038,8 @@ void QQuickDoubleValidator::resetLocaleName()
 */
 
 /*!
-    \qmlclass RegExpValidator QRegExpValidator
+    \qmltype RegExpValidator
+    \instantiates QRegExpValidator
     \inqmlmodule QtQuick 2
     \ingroup qtquick-text-utility
     \brief Provides a string validator
diff --git a/src/quick/items/qquickvisualdatamodel.cpp b/src/quick/items/qquickvisualdatamodel.cpp
index bd4f66f6fa..92cce3238e 100644
--- a/src/quick/items/qquickvisualdatamodel.cpp
+++ b/src/quick/items/qquickvisualdatamodel.cpp
@@ -120,7 +120,8 @@ QQuickVisualDataModelParts::QQuickVisualDataModelParts(QQuickVisualDataModel *pa
 //---------------------------------------------------------------------------
 
 /*!
-    \qmlclass VisualDataModel QQuickVisualDataModel
+    \qmltype VisualDataModel
+    \instantiates QQuickVisualDataModel
     \inqmlmodule QtQuick 2
     \ingroup qtquick-models
     \brief Encapsulates a model and delegate
@@ -2087,7 +2088,8 @@ void QQuickVisualDataGroupPrivate::destroyingPackage(QQuickPackage *package)
 }
 
 /*!
-    \qmlclass VisualDataGroup QQuickVisualDataGroup
+    \qmltype VisualDataGroup
+    \instantiates QQuickVisualDataGroup
     \inqmlmodule QtQuick 2
     \ingroup qtquick-models
     \brief Encapsulates a filtered set of visual data items
diff --git a/src/quick/items/qquickvisualitemmodel.cpp b/src/quick/items/qquickvisualitemmodel.cpp
index 8405a41c80..fd71deeb15 100644
--- a/src/quick/items/qquickvisualitemmodel.cpp
+++ b/src/quick/items/qquickvisualitemmodel.cpp
@@ -116,7 +116,8 @@ public:
 
 
 /*!
-    \qmlclass VisualItemModel QQuickVisualItemModel
+    \qmltype VisualItemModel
+    \instantiates QQuickVisualItemModel
     \inqmlmodule QtQuick 2
     \ingroup qtquick-models
     \brief Defines items to be used added to a view
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 4cfe1a101c..0924c24b7d 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -790,7 +790,8 @@ void QQuickWindowPrivate::cleanup(QSGNode *n)
 */
 
 /*!
-    \qmlclass Window QQuickWindow
+    \qmltype Window
+    \instantiates QQuickWindow
     \inqmlmodule QtQuick.Window 2
     \ingroup qtquick-visual
     \brief Creates a new top-level window
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index 46180cb421..912a8e34a4 100644
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -70,7 +70,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Animation QQuickAbstractAnimation
+    \qmltype Animation
+    \instantiates QQuickAbstractAnimation
     \inqmlmodule QtQuick 2
     \ingroup qtquick-transitions-animations
     \brief Is the base of all QML animations
@@ -643,7 +644,8 @@ void QQuickAbstractAnimationPrivate::animationFinished(QAbstractAnimationJob*)
 }
 
 /*!
-    \qmlclass PauseAnimation QQuickPauseAnimation
+    \qmltype PauseAnimation
+    \instantiates QQuickPauseAnimation
     \inqmlmodule QtQuick 2
     \ingroup qtquick-transitions-animations
     \inherits Animation
@@ -713,7 +715,8 @@ QAbstractAnimationJob* QQuickPauseAnimation::transition(QQuickStateActions &acti
 }
 
 /*!
-    \qmlclass ColorAnimation QQuickColorAnimation
+    \qmltype ColorAnimation
+    \instantiates QQuickColorAnimation
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-properties
     \inherits PropertyAnimation
@@ -857,7 +860,8 @@ void QActionAnimation::updateState(State newState, State oldState)
 }
 
 /*!
-    \qmlclass ScriptAction QQuickScriptAction
+    \qmltype ScriptAction
+    \instantiates QQuickScriptAction
     \inqmlmodule QtQuick 2
     \ingroup qtquick-transitions-animations
     \inherits Animation
@@ -983,7 +987,8 @@ QAbstractAnimationJob* QQuickScriptAction::transition(QQuickStateActions &action
 }
 
 /*!
-    \qmlclass PropertyAction QQuickPropertyAction
+    \qmltype PropertyAction
+    \instantiates QQuickPropertyAction
     \inqmlmodule QtQuick 2
     \ingroup qtquick-transitions-animations
     \inherits Animation
@@ -1235,7 +1240,8 @@ QAbstractAnimationJob* QQuickPropertyAction::transition(QQuickStateActions &acti
 }
 
 /*!
-    \qmlclass NumberAnimation QQuickNumberAnimation
+    \qmltype NumberAnimation
+    \instantiates QQuickNumberAnimation
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-properties
     \inherits PropertyAnimation
@@ -1347,7 +1353,8 @@ void QQuickNumberAnimation::setTo(qreal t)
 
 
 /*!
-    \qmlclass Vector3dAnimation QQuickVector3dAnimation
+    \qmltype Vector3dAnimation
+    \instantiates QQuickVector3dAnimation
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-properties
     \inherits PropertyAnimation
@@ -1423,7 +1430,8 @@ void QQuickVector3dAnimation::setTo(QVector3D t)
 
 
 /*!
-    \qmlclass RotationAnimation QQuickRotationAnimation
+    \qmltype RotationAnimation
+    \instantiates QQuickRotationAnimation
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-properties
     \inherits PropertyAnimation
@@ -1663,7 +1671,8 @@ QQmlListProperty<QQuickAbstractAnimation> QQuickAnimationGroup::animations()
 }
 
 /*!
-    \qmlclass SequentialAnimation QQuickSequentialAnimation
+    \qmltype SequentialAnimation
+    \instantiates QQuickSequentialAnimation
     \inqmlmodule QtQuick 2
     \ingroup qtquick-transitions-animations
     \inherits Animation
@@ -1736,7 +1745,8 @@ QAbstractAnimationJob* QQuickSequentialAnimation::transition(QQuickStateActions
 
 
 /*!
-    \qmlclass ParallelAnimation QQuickParallelAnimation
+    \qmltype ParallelAnimation
+    \instantiates QQuickParallelAnimation
     \inqmlmodule QtQuick 2
     \ingroup qtquick-transitions-animations
     \inherits Animation
@@ -1862,7 +1872,8 @@ void QQuickBulkValueAnimator::topLevelAnimationLoopChanged()
 }
 
 /*!
-    \qmlclass PropertyAnimation QQuickPropertyAnimation
+    \qmltype PropertyAnimation
+    \instantiates QQuickPropertyAnimation
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-properties
     \inherits Animation
diff --git a/src/quick/util/qquickanimationcontroller.cpp b/src/quick/util/qquickanimationcontroller.cpp
index 4cfee6d11f..7a0eba88d4 100644
--- a/src/quick/util/qquickanimationcontroller.cpp
+++ b/src/quick/util/qquickanimationcontroller.cpp
@@ -92,7 +92,8 @@ void QQuickAnimationControllerPrivate::animationCurrentTimeChanged(QAbstractAnim
 }
 
 /*!
-    \qmlclass AnimationController QQuickAnimationController
+    \qmltype AnimationController
+    \instantiates QQuickAnimationController
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-control
     \brief Enables manual control of animations
diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp
index ee8a1e494d..77ea7967b8 100644
--- a/src/quick/util/qquickbehavior.cpp
+++ b/src/quick/util/qquickbehavior.cpp
@@ -73,7 +73,8 @@ public:
 };
 
 /*!
-    \qmlclass Behavior QQuickBehavior
+    \qmltype Behavior
+    \instantiates QQuickBehavior
     \inqmlmodule QtQuick 2
     \ingroup qtquick-transitions-animations
     \ingroup qtquick-interceptors
diff --git a/src/quick/util/qquickbind.cpp b/src/quick/util/qquickbind.cpp
index 3ccd5222f9..9bb3185f55 100644
--- a/src/quick/util/qquickbind.cpp
+++ b/src/quick/util/qquickbind.cpp
@@ -75,7 +75,8 @@ public:
 
 
 /*!
-    \qmlclass Binding QQuickBind
+    \qmltype Binding
+    \instantiates QQuickBind
     \inqmlmodule QtQuick 2
     \ingroup qtquick-interceptors
     \brief Enables the arbitrary creation of property bindings
diff --git a/src/quick/util/qquickconnections.cpp b/src/quick/util/qquickconnections.cpp
index 654d0b7ae7..d2591557d1 100644
--- a/src/quick/util/qquickconnections.cpp
+++ b/src/quick/util/qquickconnections.cpp
@@ -71,7 +71,8 @@ public:
 };
 
 /*!
-    \qmlclass Connections QQuickConnections
+    \qmltype Connections
+    \instantiates QQuickConnections
     \inqmlmodule QtQuick 2
     \ingroup qtquick-interceptors
     \brief Describes generalized connections to signals
diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp
index 82f0468d99..3538662577 100644
--- a/src/quick/util/qquickfontloader.cpp
+++ b/src/quick/util/qquickfontloader.cpp
@@ -146,7 +146,8 @@ public:
 QHash<QUrl, QQuickFontObject*> QQuickFontLoaderPrivate::fonts;
 
 /*!
-    \qmlclass FontLoader QQuickFontLoader
+    \qmltype FontLoader
+    \instantiates QQuickFontLoader
     \inqmlmodule QtQuick 2
     \ingroup qtquick-text-utility
     \brief Allows fonts to be loaded by name or URL
diff --git a/src/quick/util/qquickpackage.cpp b/src/quick/util/qquickpackage.cpp
index 3ec28f31f1..7e82880a2c 100644
--- a/src/quick/util/qquickpackage.cpp
+++ b/src/quick/util/qquickpackage.cpp
@@ -47,7 +47,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Package QQuickPackage
+    \qmltype Package
+    \instantiates QQuickPackage
     \inqmlmodule QtQuick 2
     \ingroup qtquick-views
     \brief Specifies a collection of named items
diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp
index 2594d33950..9655cf21d1 100644
--- a/src/quick/util/qquickpath.cpp
+++ b/src/quick/util/qquickpath.cpp
@@ -53,7 +53,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass PathElement QQuickPathElement
+    \qmltype PathElement
+    \instantiates QQuickPathElement
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-paths
     \brief PathElement is the base path type
@@ -65,7 +66,8 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlclass Path QQuickPath
+    \qmltype Path
+    \instantiates QQuickPath
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-paths
     \brief Defines a path for use by \l PathView
@@ -803,7 +805,8 @@ bool QQuickCurve::hasRelativeY()
 /****************************************************************************/
 
 /*!
-    \qmlclass PathAttribute QQuickPathAttribute
+    \qmltype PathAttribute
+    \instantiates QQuickPathAttribute
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-paths
     \brief Specifies how to set an attribute at a given position in a Path
@@ -919,7 +922,8 @@ void QQuickPathAttribute::setValue(qreal value)
 /****************************************************************************/
 
 /*!
-    \qmlclass PathLine QQuickPathLine
+    \qmltype PathLine
+    \instantiates QQuickPathLine
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-paths
     \brief Defines a straight line
@@ -977,7 +981,8 @@ void QQuickPathLine::addToPath(QPainterPath &path, const QQuickPathData &data)
 /****************************************************************************/
 
 /*!
-    \qmlclass PathQuad QQuickPathQuad
+    \qmltype PathQuad
+    \instantiates QQuickPathQuad
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-paths
     \brief Defines a quadratic Bezier curve with a control point
@@ -1128,7 +1133,8 @@ void QQuickPathQuad::addToPath(QPainterPath &path, const QQuickPathData &data)
 /****************************************************************************/
 
 /*!
-    \qmlclass PathCubic QQuickPathCubic
+    \qmltype PathCubic
+    \instantiates QQuickPathCubic
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-paths
     \brief Defines a cubic Bezier curve with two control points
@@ -1351,7 +1357,8 @@ void QQuickPathCubic::addToPath(QPainterPath &path, const QQuickPathData &data)
 /****************************************************************************/
 
 /*!
-    \qmlclass PathCurve QQuickPathCurve
+    \qmltype PathCurve
+    \instantiates QQuickPathCurve
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-paths
     \brief Defines a point on a Catmull-Rom curve
@@ -1496,7 +1503,8 @@ void QQuickPathCatmullRomCurve::addToPath(QPainterPath &path, const QQuickPathDa
 /****************************************************************************/
 
 /*!
-    \qmlclass PathArc QQuickPathArc
+    \qmltype PathArc
+    \instantiates QQuickPathArc
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-paths
     \brief Defines an arc with the given radius
@@ -1666,7 +1674,8 @@ void QQuickPathArc::addToPath(QPainterPath &path, const QQuickPathData &data)
 /****************************************************************************/
 
 /*!
-    \qmlclass PathSvg QQuickPathSvg
+    \qmltype PathSvg
+    \instantiates QQuickPathSvg
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-paths
     \brief Defines a path using an SVG path data string
@@ -1718,7 +1727,8 @@ void QQuickPathSvg::addToPath(QPainterPath &path, const QQuickPathData &)
 /****************************************************************************/
 
 /*!
-    \qmlclass PathPercent QQuickPathPercent
+    \qmltype PathPercent
+    \instantiates QQuickPathPercent
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-paths
     \brief Manipulates the way a path is interpreted
diff --git a/src/quick/util/qquickpathinterpolator.cpp b/src/quick/util/qquickpathinterpolator.cpp
index 1430f72058..034e5f4045 100644
--- a/src/quick/util/qquickpathinterpolator.cpp
+++ b/src/quick/util/qquickpathinterpolator.cpp
@@ -46,7 +46,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass PathInterpolator QQuickPathInterpolator
+    \qmltype PathInterpolator
+    \instantiates QQuickPathInterpolator
     \inqmlmodule QtQuick 2
     \ingroup qtquick-animation-control
     \brief Specifies how to manually animate along a path
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index 68e5a0e247..6bd48e2900 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -64,7 +64,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass PropertyChanges QQuickPropertyChanges
+    \qmltype PropertyChanges
+    \instantiates QQuickPropertyChanges
     \inqmlmodule QtQuick 2
     \ingroup qtquick-states
     \brief Describes new property bindings or values for a state
diff --git a/src/quick/util/qquicksmoothedanimation.cpp b/src/quick/util/qquicksmoothedanimation.cpp
index 7a7968472b..9684cf6c0c 100644
--- a/src/quick/util/qquicksmoothedanimation.cpp
+++ b/src/quick/util/qquicksmoothedanimation.cpp
@@ -307,7 +307,8 @@ void QSmoothedAnimation::init()
 }
 
 /*!
-    \qmlclass SmoothedAnimation QQuickSmoothedAnimation
+    \qmltype SmoothedAnimation
+    \instantiates QQuickSmoothedAnimation
     \inqmlmodule QtQuick 2
     \ingroup qtquick-transitions-animations
     \inherits NumberAnimation
diff --git a/src/quick/util/qquickspringanimation.cpp b/src/quick/util/qquickspringanimation.cpp
index 718eaf0bab..e5780f6087 100644
--- a/src/quick/util/qquickspringanimation.cpp
+++ b/src/quick/util/qquickspringanimation.cpp
@@ -340,7 +340,8 @@ void QQuickSpringAnimationPrivate::updateMode()
 }
 
 /*!
-    \qmlclass SpringAnimation QQuickSpringAnimation
+    \qmltype SpringAnimation
+    \instantiates QQuickSpringAnimation
     \inqmlmodule QtQuick 2
     \ingroup qtquick-transitions-animations
     \inherits NumberAnimation
diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp
index 98dbd6d30c..99f9819590 100644
--- a/src/quick/util/qquickstate.cpp
+++ b/src/quick/util/qquickstate.cpp
@@ -120,7 +120,8 @@ QQuickStateOperation::QQuickStateOperation(QObjectPrivate &dd, QObject *parent)
 }
 
 /*!
-    \qmlclass State QQuickState
+    \qmltype State
+    \instantiates QQuickState
     \inqmlmodule QtQuick 2
     \ingroup qtquick-states
     \brief Defines configurations of objects and properties
diff --git a/src/quick/util/qquickstatechangescript.cpp b/src/quick/util/qquickstatechangescript.cpp
index 19bd21f3d4..ef894968f5 100644
--- a/src/quick/util/qquickstatechangescript.cpp
+++ b/src/quick/util/qquickstatechangescript.cpp
@@ -68,7 +68,8 @@ public:
 };
 
 /*!
-    \qmlclass StateChangeScript QQuickStateChangeScript
+    \qmltype StateChangeScript
+    \instantiates QQuickStateChangeScript
     \inqmlmodule QtQuick 2
     \ingroup qtquick-states
     \brief Specifies how to run a script in a state
diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp
index 9e0909b741..23a7348ded 100644
--- a/src/quick/util/qquickstategroup.cpp
+++ b/src/quick/util/qquickstategroup.cpp
@@ -92,7 +92,8 @@ public:
 };
 
 /*!
-   \qmlclass StateGroup QQuickStateGroup
+   \qmltype StateGroup
+    \instantiates QQuickStateGroup
     \inqmlmodule QtQuick 2
    \ingroup qtquick-states
    \brief Provides built-in state support for non-Item types
diff --git a/src/quick/util/qquicksystempalette.cpp b/src/quick/util/qquicksystempalette.cpp
index 7c234a3264..1a2e9f65fe 100644
--- a/src/quick/util/qquicksystempalette.cpp
+++ b/src/quick/util/qquicksystempalette.cpp
@@ -57,7 +57,8 @@ public:
 
 
 /*!
-    \qmlclass SystemPalette QQuickSystemPalette
+    \qmltype SystemPalette
+    \instantiates QQuickSystemPalette
     \inqmlmodule QtQuick 2
     \ingroup qtquick-visual-utility
     \brief Provides access to the Qt palettes
diff --git a/src/quick/util/qquicktimer.cpp b/src/quick/util/qquicktimer.cpp
index 7b747005e2..1124eff0e2 100644
--- a/src/quick/util/qquicktimer.cpp
+++ b/src/quick/util/qquicktimer.cpp
@@ -73,7 +73,8 @@ public:
 };
 
 /*!
-    \qmlclass Timer QQuickTimer
+    \qmltype Timer
+    \instantiates QQuickTimer
     \inqmlmodule QtQuick 2
     \ingroup qtquick-interceptors
     \brief Triggers a handler at a specified interval
diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp
index 32c97565ce..1548c07254 100644
--- a/src/quick/util/qquicktransition.cpp
+++ b/src/quick/util/qquicktransition.cpp
@@ -53,7 +53,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Transition QQuickTransition
+    \qmltype Transition
+    \instantiates QQuickTransition
     \inqmlmodule QtQuick 2
     \ingroup qtquick-transitions-animations
     \brief Defines animated transitions that occur on state changes