From: Jerome Pasion <jerome.pasion@digia.com>
Date: Tue, 24 Sep 2013 14:41:12 +0000 (+0200)
Subject: Doc: Fixed and updated Qt Quick's \qmlmodule page
X-Git-Tag: upstream/5.2.1~398
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e62896fdcbad014177ba11d88bbe46eb496ab2d;p=platform%2Fupstream%2Fqtdeclarative.git

Doc: Fixed and updated Qt Quick's \qmlmodule page

-incremented version to Qt Quick 2.2 (in \qmlmodule page)
-import changed to QtQuick 2.2
-\inqmlmodule no longer needs the version. QDoc will ignore the version
but it is better to remove it now to avoid confusion

Task-number: QTBUG-32172
Change-Id: I40b52e59667014720be40a35b3a8fb9836825e31
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
---

diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index 64f4d5c..0fa0c73 100644
--- a/src/qml/types/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
@@ -139,7 +139,7 @@ QQmlDelegateModelParts::QQmlDelegateModelParts(QQmlDelegateModel *parent)
 /*!
     \qmltype VisualDataModel
     \instantiates QQmlDelegateModel
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-models
     \brief Encapsulates a model and delegate
 
@@ -2196,7 +2196,7 @@ void QQmlDelegateModelGroupPrivate::destroyingPackage(QQuickPackage *package)
 /*!
     \qmltype VisualDataGroup
     \instantiates QQmlDelegateModelGroup
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-models
     \brief Encapsulates a filtered set of visual data items
 
diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp
index f2a7477..3cf87bf 100644
--- a/src/qml/types/qqmlobjectmodel.cpp
+++ b/src/qml/types/qqmlobjectmodel.cpp
@@ -169,7 +169,7 @@ public:
 /*!
     \qmltype VisualItemModel
     \instantiates QQmlObjectModel
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \brief Defines a set of objects to be used as a model
 
     The VisualItemModel type encapsulates contains the objects to be used
diff --git a/src/qml/types/qquickpackage.cpp b/src/qml/types/qquickpackage.cpp
index bdb8a4b..e013a0d 100644
--- a/src/qml/types/qquickpackage.cpp
+++ b/src/qml/types/qquickpackage.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Package
     \instantiates QQuickPackage
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-views
     \brief Specifies a collection of named items
 
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp
index 02fae8c..ef23a34 100644
--- a/src/qml/types/qquickworkerscript.cpp
+++ b/src/qml/types/qquickworkerscript.cpp
@@ -574,7 +574,7 @@ void QQuickWorkerScriptEngine::run()
     \qmltype WorkerScript
     \instantiates QQuickWorkerScript
     \ingroup qtquick-threading
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \brief Enables the use of threads in a Qt Quick application
 
     Use WorkerScript to run operations in a new thread.
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index 6863758..d247b33 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -304,15 +304,15 @@ Data Storage
 */
 
 /*!
-\qmlmodule QtQuick 2
-\brief The \c {QtQuick 2} module provides graphical primitives for use in QML.
+\qmlmodule QtQuick 2.2
+\brief The Provides graphical primitives for use in QML.
 
-The \c {QtQuick 2} module provides graphical primitive types. They can be used with the following import
+The \l{Qt Quick} module provides graphical primitive types. They can be used with the following import
 \code
-import QtQuick 2.1
+import QtQuick 2.2
 \endcode
 
-For a more detailed listing of types in the \c {QtQuick 2} import, see the \l{Qt Quick QML Types} page.
+For a more detailed listing of types in the \c {QtQuick} import, see the \l{Qt Quick QML Types} page.
 For more details about the module itself, see the \l{Qt Quick} module page.
 */
 
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index bb99975..f21abda 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -208,7 +208,7 @@ QQuickCanvasItemPrivate::~QQuickCanvasItemPrivate()
 /*!
     \qmltype Canvas
     \instantiates QQuickCanvasItem
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.0
     \inherits Item
     \ingroup qtquick-canvas
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 0903605..1930fb6 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Context2D
     \instantiates QQuickContext2D
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-canvas
     \since 5.0
     \brief Provides 2D context for shapes on a Canvas item
@@ -2834,7 +2834,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_strokeText(QV4::SimpleCall
 
 /*!
   \qmltype TextMetrics
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.0
     \ingroup qtquick-canvas
     \brief Provides a Context2D TextMetrics interface
@@ -3047,7 +3047,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_drawImage(QV4::SimpleCallC
 // pixel manipulation
 /*!
     \qmltype CanvasImageData
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-canvas
     \brief Contains image pixel data in RGBA order
 
@@ -3111,7 +3111,7 @@ QV4::ReturnedValue QQuickJSContext2DImageData::method_get_data(QV4::SimpleCallCo
 
 /*!
     \qmltype CanvasPixelArray
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-canvas
     \brief Provides ordered and indexed access to the components of each pixel in image data
 
@@ -3375,7 +3375,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_putImageData(QV4::SimpleCa
 
 /*!
     \qmltype CanvasGradient
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.0
     \ingroup qtquick-canvas
     \brief Provides an opaque CanvasGradient interface
diff --git a/src/quick/items/qquickaccessibleattached.cpp b/src/quick/items/qquickaccessibleattached.cpp
index 2025db4..a3c8fc1 100644
--- a/src/quick/items/qquickaccessibleattached.cpp
+++ b/src/quick/items/qquickaccessibleattached.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
     \instantiates QQuickAccessibleAttached
     \brief Enables accessibility of QML items
 
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual-utility
     \ingroup accessibility
 
diff --git a/src/quick/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp
index 452cc04..dba8fca 100644
--- a/src/quick/items/qquickanimatedimage.cpp
+++ b/src/quick/items/qquickanimatedimage.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype AnimatedImage
     \instantiates QQuickAnimatedImage
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \inherits Image
     \brief Plays animations stored as a series of images
     \ingroup qtquick-visual
diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp
index c7c66d6..a265fed 100644
--- a/src/quick/items/qquickanimatedsprite.cpp
+++ b/src/quick/items/qquickanimatedsprite.cpp
@@ -210,7 +210,7 @@ struct AnimatedSpriteVertices {
 /*!
     \qmltype AnimatedSprite
     \instantiates QQuickAnimatedSprite
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \inherits Item
     \ingroup qtquick-visual
     \brief Draws a sprite animation
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp
index 009a35f..de1fd6b 100644
--- a/src/quick/items/qquickborderimage.cpp
+++ b/src/quick/items/qquickborderimage.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype BorderImage
     \instantiates QQuickBorderImage
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \brief Paints a border based on an image
     \inherits Item
     \ingroup qtquick-visual
diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index 6e57136..d66c57c 100644
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -116,7 +116,7 @@ public:
 /*!
     \qmltype Drag
     \instantiates QQuickDrag
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \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 c12e156..5103750 100644
--- a/src/quick/items/qquickdroparea.cpp
+++ b/src/quick/items/qquickdroparea.cpp
@@ -94,7 +94,7 @@ QQuickDropAreaPrivate::~QQuickDropAreaPrivate()
 /*!
     \qmltype DropArea
     \instantiates QQuickDropArea
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-input
     \brief For specifying drag and drop handling in an area
 
@@ -330,7 +330,7 @@ void QQuickDropArea::dropEvent(QDropEvent *event)
 /*!
     \qmltype DragEvent
     \instantiates QQuickDropEvent
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \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 cc1a5ee..3cfe41f 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype KeyEvent
     \instantiates QQuickKeyEvent
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-input-events
 
     \brief Provides information about a key event
@@ -171,7 +171,7 @@ Item {
 /*!
     \qmltype MouseEvent
     \instantiates QQuickMouseEvent
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-input-events
 
     \brief Provides information about a mouse event
@@ -270,7 +270,7 @@ Item {
 /*!
     \qmltype WheelEvent
     \instantiates QQuickWheelEvent
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \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 9a97b1e..89ccc2d 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -599,7 +599,7 @@ is finished.
 /*!
     \qmltype Flickable
     \instantiates QQuickFlickable
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-input
     \ingroup qtquick-containers
 
diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp
index 3428c66..85d1b22 100644
--- a/src/quick/items/qquickflipable.cpp
+++ b/src/quick/items/qquickflipable.cpp
@@ -89,7 +89,7 @@ public:
 /*!
     \qmltype Flipable
     \instantiates QQuickFlipable
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \inherits Item
     \ingroup qtquick-input
     \ingroup qtquick-containers
diff --git a/src/quick/items/qquickfocusscope.cpp b/src/quick/items/qquickfocusscope.cpp
index 4091e32..45ee8bc 100644
--- a/src/quick/items/qquickfocusscope.cpp
+++ b/src/quick/items/qquickfocusscope.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype FocusScope
     \instantiates QQuickFocusScope
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-input
 
     \brief Explicitly creates a focus scope
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index d271017..0c6010d 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -1124,7 +1124,7 @@ bool QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
 /*!
     \qmltype GridView
     \instantiates QQuickGridView
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-views
 
     \inherits Flickable
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index be3011b..682ae23 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -94,7 +94,7 @@ QQuickImagePrivate::QQuickImagePrivate()
 /*!
     \qmltype Image
     \instantiates QQuickImage
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual
     \inherits Item
     \brief Displays an image
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 971d4e0..3ecd5f5 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -141,7 +141,7 @@ void QQuickItemPrivate::registerAccessorProperties()
 /*!
     \qmltype Transform
     \instantiates QQuickTransform
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual-transforms
     \brief For specifying advanced transformations on Items
 
@@ -377,7 +377,7 @@ void QQuickItemKeyFilter::componentComplete()
 /*!
     \qmltype KeyNavigation
     \instantiates QQuickKeyNavigationAttached
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-input
     \brief Supports key navigation by arrow keys
 
@@ -810,7 +810,7 @@ bool QQuickKeysAttached::isConnected(const char *signalName)
 /*!
     \qmltype Keys
     \instantiates QQuickKeysAttached
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-input
     \brief Provides key handling to Items
 
@@ -1361,7 +1361,7 @@ QQuickKeysAttached *QQuickKeysAttached::qmlAttachedProperties(QObject *obj)
 /*!
     \qmltype LayoutMirroring
     \instantiates QQuickLayoutMirroringAttached
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-positioners
     \ingroup qml-utility-elements
     \brief Property used to mirror layout behavior
@@ -1623,7 +1623,7 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus)
     \qmltype Item
     \instantiates QQuickItem
     \inherits QtObject
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual
     \brief A basic visual QML type
 
diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp
index 296cce4..1297515 100644
--- a/src/quick/items/qquickitemanimation.cpp
+++ b/src/quick/items/qquickitemanimation.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype ParentAnimation
     \instantiates QQuickParentAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-properties
     \since 5.0
     \inherits Animation
@@ -415,7 +415,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act
 /*!
     \qmltype AnchorAnimation
     \instantiates QQuickAnchorAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-properties
     \inherits Animation
     \brief Animates changes in anchor values
@@ -558,7 +558,7 @@ QAbstractAnimationJob* QQuickAnchorAnimation::transition(QQuickStateActions &act
 /*!
     \qmltype PathAnimation
     \instantiates QQuickPathAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-properties
     \inherits Animation
     \since 5.0
diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp
index c1cc7c9..9ccd701 100644
--- a/src/quick/items/qquickitemviewtransition.cpp
+++ b/src/quick/items/qquickitemviewtransition.cpp
@@ -568,7 +568,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent)
 /*!
     \qmltype ViewTransition
     \instantiates QQuickViewTransitionAttached
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \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 1abf2ad..210f385 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -1646,7 +1646,7 @@ bool QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
 /*!
     \qmltype ListView
     \instantiates QQuickListView
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-views
     \inherits Flickable
     \brief Provides a list view of items provided by a model
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index ec71bd4..3dee563 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -158,7 +158,7 @@ qreal QQuickLoaderPrivate::getImplicitHeight() const
 /*!
     \qmltype Loader
     \instantiates QQuickLoader
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-dynamic
     \inherits Item
 
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index 39f07f2..05ae9f7 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -192,7 +192,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i
 /*!
     \qmltype MouseArea
     \instantiates QQuickMouseArea
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-input
     \brief Enables simple mouse handling
     \inherits Item
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp
index d6b00ce..d2a2a5f 100644
--- a/src/quick/items/qquickmultipointtoucharea.cpp
+++ b/src/quick/items/qquickmultipointtoucharea.cpp
@@ -56,7 +56,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlVisualTouchDebugging, QML_VISUAL_TOUCH_DEBUGGING)
 /*!
     \qmltype TouchPoint
     \instantiates QQuickTouchPoint
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-input-events
     \brief Describes a touch point in a MultiPointTouchArea
 
@@ -226,7 +226,7 @@ void QQuickTouchPoint::setSceneY(qreal sceneY)
 /*!
     \qmltype MultiPointTouchArea
     \instantiates QQuickMultiPointTouchArea
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \inherits Item
     \ingroup qtquick-input
     \brief Enables handling of multiple touch points
diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp
index ff6397c..1663793 100644
--- a/src/quick/items/qquickpathview.cpp
+++ b/src/quick/items/qquickpathview.cpp
@@ -492,7 +492,7 @@ void QQuickPathViewPrivate::setDragging(bool d)
 /*!
     \qmltype PathView
     \instantiates QQuickPathView
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-paths
     \ingroup qtquick-views
     \inherits Item
diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp
index 434eaa8..0f68494 100644
--- a/src/quick/items/qquickpincharea.cpp
+++ b/src/quick/items/qquickpincharea.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype PinchEvent
     \instantiates QQuickPinchEvent
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-input-events
     \brief For specifying information about a pinch event
 
@@ -165,7 +165,7 @@ QQuickPinchAreaPrivate::~QQuickPinchAreaPrivate()
 /*!
     \qmltype PinchArea
     \instantiates QQuickPinchArea
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-input
     \inherits Item
     \brief Enables simple pinch gesture handling
diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp
index 6872188..0e21231 100644
--- a/src/quick/items/qquickpositioners.cpp
+++ b/src/quick/items/qquickpositioners.cpp
@@ -513,7 +513,7 @@ void QQuickBasePositioner::updateAttachedProperties(QQuickPositionerAttached *sp
 /*!
     \qmltype Positioner
     \instantiates QQuickPositionerAttached
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-positioners
     \brief Provides attached properties that contain details on where an item exists in a positioner
 
@@ -596,7 +596,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem)
 /*!
     \qmltype Column
     \instantiates QQuickColumn
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \inherits Item
     \ingroup qtquick-positioners
     \brief Positions its children in a column
@@ -765,7 +765,7 @@ void QQuickColumn::reportConflictingAnchors()
 /*!
     \qmltype Row
     \instantiates QQuickRow
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \inherits Item
     \ingroup qtquick-positioners
     \brief Positions its children in a row
@@ -997,7 +997,7 @@ void QQuickRow::reportConflictingAnchors()
 /*!
     \qmltype Grid
     \instantiates QQuickGrid
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \inherits Item
     \ingroup qtquick-positioners
     \brief Positions its children in grid formation
@@ -1546,7 +1546,7 @@ void QQuickGrid::reportConflictingAnchors()
 /*!
     \qmltype Flow
     \instantiates QQuickFlow
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \inherits Item
     \ingroup qtquick-positioners
     \brief Positions its children side by side, wrapping as necessary
diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp
index c9f3793..75415a4 100644
--- a/src/quick/items/qquickrectangle.cpp
+++ b/src/quick/items/qquickrectangle.cpp
@@ -130,7 +130,7 @@ bool QQuickPen::isValid() const
 /*!
     \qmltype GradientStop
     \instantiates QQuickGradientStop
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual-utility
     \brief Defines the color at a position in a Gradient
 
@@ -182,7 +182,7 @@ void QQuickGradientStop::updateGradient()
 /*!
     \qmltype Gradient
     \instantiates QQuickGradient
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual-utility
     \brief Defines a gradient fill
 
@@ -265,7 +265,7 @@ int QQuickRectanglePrivate::doUpdateSlotIdx = -1;
 /*!
     \qmltype Rectangle
     \instantiates QQuickRectangle
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \inherits Item
     \ingroup qtquick-visual
     \brief Paints a filled rectangle with an optional border
diff --git a/src/quick/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp
index d92b3b4..b51ab27 100644
--- a/src/quick/items/qquickrepeater.cpp
+++ b/src/quick/items/qquickrepeater.cpp
@@ -65,7 +65,7 @@ QQuickRepeaterPrivate::~QQuickRepeaterPrivate()
 /*!
     \qmltype Repeater
     \instantiates QQuickRepeater
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-models
     \ingroup qtquick-positioning
     \inherits Item
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp
index 3a36f1a..255b1e1 100644
--- a/src/quick/items/qquickshadereffect.cpp
+++ b/src/quick/items/qquickshadereffect.cpp
@@ -535,7 +535,7 @@ void QQuickShaderEffectCommon::propertyChanged(QQuickItem *item, int mappedId,
 /*!
     \qmltype ShaderEffect
     \instantiates QQuickShaderEffect
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \inherits Item
     \ingroup qtquick-effects
     \brief Applies custom shaders to a rectangle
diff --git a/src/quick/items/qquickshadereffectmesh.cpp b/src/quick/items/qquickshadereffectmesh.cpp
index 7b0fb62..0c3d55a 100644
--- a/src/quick/items/qquickshadereffectmesh.cpp
+++ b/src/quick/items/qquickshadereffectmesh.cpp
@@ -53,7 +53,7 @@ QQuickShaderEffectMesh::QQuickShaderEffectMesh(QObject *parent)
 /*!
     \qmltype GridMesh
     \instantiates QQuickGridMesh
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.0
     \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 46ac19c..480cb67 100644
--- a/src/quick/items/qquickshadereffectsource.cpp
+++ b/src/quick/items/qquickshadereffectsource.cpp
@@ -468,7 +468,7 @@ QImage QQuickShaderEffectTexture::toImage() const
 /*!
     \qmltype ShaderEffectSource
     \instantiates QQuickShaderEffectSource
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.0
     \inherits Item
     \ingroup qtquick-effects
diff --git a/src/quick/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp
index b413830..ff4b8f0 100644
--- a/src/quick/items/qquicksprite.cpp
+++ b/src/quick/items/qquicksprite.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Sprite
     \instantiates QQuickSprite
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual-utility
     \brief Specifies sprite animations
 
diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp
index fa15e8b..13816e8 100644
--- a/src/quick/items/qquickspritesequence.cpp
+++ b/src/quick/items/qquickspritesequence.cpp
@@ -209,7 +209,7 @@ struct SpriteVertices {
 /*!
     \qmltype SpriteSequence
     \instantiates QQuickSpriteSequence
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual-utility
     \inherits Item
     \brief Draws a sprite animation
diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp
index b1c548f..2732545 100644
--- a/src/quick/items/qquickstateoperations.cpp
+++ b/src/quick/items/qquickstateoperations.cpp
@@ -149,7 +149,7 @@ void QQuickParentChangePrivate::doChange(QQuickItem *targetParent, QQuickItem *s
 /*!
     \qmltype ParentChange
     \instantiates QQuickParentChange
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-states
     \brief Specifies how to reparent an Item in a state change
 
@@ -555,7 +555,7 @@ void QQuickParentChange::rewind()
 /*!
     \qmltype AnchorChanges
     \instantiates QQuickAnchorChanges
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \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 25c12a2..de26e43 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -1238,7 +1238,7 @@ void QQuickTextPrivate::ensureDoc()
 /*!
     \qmltype Text
     \instantiates QQuickText
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual
     \inherits Item
     \brief Specifies how to add formatted text to a scene
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index 63b91d4..6767e3f 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype TextEdit
     \instantiates QQuickTextEdit
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual
     \ingroup qtquick-input
     \inherits Item
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 0cbb6e8..b5b8699 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -71,7 +71,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
 /*!
     \qmltype TextInput
     \instantiates QQuickTextInput
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual
     \ingroup qtquick-input
     \inherits Item
@@ -908,7 +908,7 @@ void QQuickTextInput::setAutoScroll(bool b)
 /*!
     \qmltype IntValidator
     \instantiates QIntValidator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-text-utility
     \brief Defines a validator for integer values
 
@@ -972,7 +972,7 @@ void QQuickIntValidator::resetLocaleName()
 /*!
     \qmltype DoubleValidator
     \instantiates QDoubleValidator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-text-utility
     \brief Defines a validator for non-integer numbers
 
@@ -1066,7 +1066,7 @@ void QQuickDoubleValidator::resetLocaleName()
 /*!
     \qmltype RegExpValidator
     \instantiates QRegExpValidator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-text-utility
     \brief Provides a string validator
 
diff --git a/src/quick/items/qquicktranslate.cpp b/src/quick/items/qquicktranslate.cpp
index 43712e1..4352f50 100644
--- a/src/quick/items/qquicktranslate.cpp
+++ b/src/quick/items/qquicktranslate.cpp
@@ -60,7 +60,7 @@ public:
 /*!
     \qmltype Translate
     \instantiates QQuickTranslate
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual-transforms
     \brief Provides a way to move an Item without changing its x or y properties
 
@@ -164,7 +164,7 @@ public:
 /*!
     \qmltype Scale
     \instantiates QQuickScale
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual-transforms
     \brief Provides a way to scale an Item
 
@@ -305,7 +305,7 @@ public:
 /*!
     \qmltype Rotation
     \instantiates QQuickRotation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual-transforms
     \brief Provides a way to rotate an Item
 
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index 904842b..6095352 100644
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Animation
     \instantiates QQuickAbstractAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \brief Is the base of all QML animations
 
@@ -656,7 +656,7 @@ QQuickAbstractAnimation::ThreadingModel QQuickAbstractAnimation::threadingModel(
 /*!
     \qmltype PauseAnimation
     \instantiates QQuickPauseAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \inherits Animation
     \brief Provides a pause for an animation
@@ -727,7 +727,7 @@ QAbstractAnimationJob* QQuickPauseAnimation::transition(QQuickStateActions &acti
 /*!
     \qmltype ColorAnimation
     \instantiates QQuickColorAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-properties
     \inherits PropertyAnimation
     \brief Animates changes in color values
@@ -872,7 +872,7 @@ void QActionAnimation::updateState(State newState, State oldState)
 /*!
     \qmltype ScriptAction
     \instantiates QQuickScriptAction
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \inherits Animation
     \brief Defines scripts to be run during an animation
@@ -999,7 +999,7 @@ QAbstractAnimationJob* QQuickScriptAction::transition(QQuickStateActions &action
 /*!
     \qmltype PropertyAction
     \instantiates QQuickPropertyAction
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \inherits Animation
     \brief Specifies immediate property changes during animation
@@ -1252,7 +1252,7 @@ QAbstractAnimationJob* QQuickPropertyAction::transition(QQuickStateActions &acti
 /*!
     \qmltype NumberAnimation
     \instantiates QQuickNumberAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-properties
     \inherits PropertyAnimation
     \brief Animates changes in qreal-type values
@@ -1365,7 +1365,7 @@ void QQuickNumberAnimation::setTo(qreal t)
 /*!
     \qmltype Vector3dAnimation
     \instantiates QQuickVector3dAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-properties
     \inherits PropertyAnimation
     \brief Animates changes in QVector3d values
@@ -1442,7 +1442,7 @@ void QQuickVector3dAnimation::setTo(QVector3D t)
 /*!
     \qmltype RotationAnimation
     \instantiates QQuickRotationAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-properties
     \inherits PropertyAnimation
     \brief Animates changes in rotation values
@@ -1683,7 +1683,7 @@ QQmlListProperty<QQuickAbstractAnimation> QQuickAnimationGroup::animations()
 /*!
     \qmltype SequentialAnimation
     \instantiates QQuickSequentialAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \inherits Animation
     \brief Allows animations to be run sequentially
@@ -1777,7 +1777,7 @@ QAbstractAnimationJob* QQuickSequentialAnimation::transition(QQuickStateActions
 /*!
     \qmltype ParallelAnimation
     \instantiates QQuickParallelAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \inherits Animation
     \brief Enables animations to be run in parallel
@@ -1926,7 +1926,7 @@ void QQuickBulkValueAnimator::topLevelAnimationLoopChanged()
 /*!
     \qmltype PropertyAnimation
     \instantiates QQuickPropertyAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-properties
     \inherits Animation
     \brief Animates changes in property values
diff --git a/src/quick/util/qquickanimationcontroller.cpp b/src/quick/util/qquickanimationcontroller.cpp
index caf1408..ac2075d 100644
--- a/src/quick/util/qquickanimationcontroller.cpp
+++ b/src/quick/util/qquickanimationcontroller.cpp
@@ -96,7 +96,7 @@ void QQuickAnimationControllerPrivate::animationCurrentTimeChanged(QAbstractAnim
 /*!
     \qmltype AnimationController
     \instantiates QQuickAnimationController
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-control
     \brief Enables manual control of animations
 
diff --git a/src/quick/util/qquickanimator.cpp b/src/quick/util/qquickanimator.cpp
index de1cf26..59e2d8c 100644
--- a/src/quick/util/qquickanimator.cpp
+++ b/src/quick/util/qquickanimator.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Animator
     \instantiates QQuickAnimator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.2
     \ingroup qtquick-transitions-animations
     \brief Is the base of all QML animators.
@@ -290,7 +290,7 @@ QAbstractAnimationJob *QQuickAnimator::transition(QQuickStateActions &actions,
 /*!
     \qmltype XAnimator
     \instantiates QQuickXAnimator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.2
     \ingroup qtquick-transitions-animations
     \brief The XAnimator type animates the x position of an Item.
@@ -322,7 +322,7 @@ QQuickAnimatorJob *QQuickXAnimator::createJob() const { return new QQuickXAnimat
 /*!
     \qmltype YAnimator
     \instantiates QQuickYAnimator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.2
     \ingroup qtquick-transitions-animations
     \brief The YAnimator type animates the y position of an Item.
@@ -354,7 +354,7 @@ QQuickAnimatorJob *QQuickYAnimator::createJob() const { return new QQuickYAnimat
 /*!
     \qmltype ScaleAnimator
     \instantiates QQuickScaleAnimator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.2
     \ingroup qtquick-transitions-animations
     \brief The ScaleAnimator type animates the scale factor of an Item.
@@ -386,7 +386,7 @@ QQuickAnimatorJob *QQuickScaleAnimator::createJob() const { return new QQuickSca
 /*!
     \qmltype OpacityAnimator
     \instantiates QQuickOpacityAnimator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.2
     \ingroup qtquick-transitions-animations
     \brief The OpacityAnimator type animates the opacity of an Item.
@@ -417,7 +417,7 @@ QQuickAnimatorJob *QQuickOpacityAnimator::createJob() const { return new QQuickO
 /*!
     \qmltype RotationAnimator
     \instantiates QQuickRotationAnimator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.2
     \ingroup qtquick-transitions-animations
     \brief The RotationAnimator type animates the rotation of an Item.
@@ -488,7 +488,7 @@ QQuickRotationAnimator::RotationDirection QQuickRotationAnimator::direction() co
 /*!
     \qmltype UniformAnimator
     \instantiates QQuickUniformAnimator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \since 5.2
     \ingroup qtquick-transitions-animations
     \brief The UniformAnimator type animates a uniform of a ShaderEffect.
diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp
index 855e99e..41c7b63 100644
--- a/src/quick/util/qquickbehavior.cpp
+++ b/src/quick/util/qquickbehavior.cpp
@@ -76,7 +76,7 @@ public:
 /*!
     \qmltype Behavior
     \instantiates QQuickBehavior
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \ingroup qtquick-interceptors
     \brief Defines a default animation for a property change
diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp
index 841c788..d53edb3 100644
--- a/src/quick/util/qquickfontloader.cpp
+++ b/src/quick/util/qquickfontloader.cpp
@@ -148,7 +148,7 @@ QHash<QUrl, QQuickFontObject*> QQuickFontLoaderPrivate::fonts;
 /*!
     \qmltype FontLoader
     \instantiates QQuickFontLoader
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-text-utility
     \brief Allows fonts to be loaded by name or URL
 
diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp
index 2278fd2..1c766b3 100644
--- a/src/quick/util/qquickpath.cpp
+++ b/src/quick/util/qquickpath.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype PathElement
     \instantiates QQuickPathElement
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief PathElement is the base path type
 
@@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Path
     \instantiates QQuickPath
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Defines a path for use by \l PathView
 
@@ -888,7 +888,7 @@ bool QQuickCurve::hasRelativeY()
 /*!
     \qmltype PathAttribute
     \instantiates QQuickPathAttribute
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Specifies how to set an attribute at a given position in a Path
 
@@ -1005,7 +1005,7 @@ void QQuickPathAttribute::setValue(qreal value)
 /*!
     \qmltype PathLine
     \instantiates QQuickPathLine
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Defines a straight line
 
@@ -1064,7 +1064,7 @@ void QQuickPathLine::addToPath(QPainterPath &path, const QQuickPathData &data)
 /*!
     \qmltype PathQuad
     \instantiates QQuickPathQuad
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Defines a quadratic Bezier curve with a control point
 
@@ -1216,7 +1216,7 @@ void QQuickPathQuad::addToPath(QPainterPath &path, const QQuickPathData &data)
 /*!
     \qmltype PathCubic
     \instantiates QQuickPathCubic
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Defines a cubic Bezier curve with two control points
 
@@ -1440,7 +1440,7 @@ void QQuickPathCubic::addToPath(QPainterPath &path, const QQuickPathData &data)
 /*!
     \qmltype PathCurve
     \instantiates QQuickPathCatmullRomCurve
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Defines a point on a Catmull-Rom curve
 
@@ -1586,7 +1586,7 @@ void QQuickPathCatmullRomCurve::addToPath(QPainterPath &path, const QQuickPathDa
 /*!
     \qmltype PathArc
     \instantiates QQuickPathArc
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Defines an arc with the given radius
 
@@ -1757,7 +1757,7 @@ void QQuickPathArc::addToPath(QPainterPath &path, const QQuickPathData &data)
 /*!
     \qmltype PathSvg
     \instantiates QQuickPathSvg
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-animation-paths
     \brief Defines a path using an SVG path data string
 
@@ -1810,7 +1810,7 @@ void QQuickPathSvg::addToPath(QPainterPath &path, const QQuickPathData &)
 /*!
     \qmltype PathPercent
     \instantiates QQuickPathPercent
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \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 fad7ae9..439e79c 100644
--- a/src/quick/util/qquickpathinterpolator.cpp
+++ b/src/quick/util/qquickpathinterpolator.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype PathInterpolator
     \instantiates QQuickPathInterpolator
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \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 e6f89b9..635f658 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype PropertyChanges
     \instantiates QQuickPropertyChanges
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \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 9dd9aa2..fda0a90 100644
--- a/src/quick/util/qquicksmoothedanimation.cpp
+++ b/src/quick/util/qquicksmoothedanimation.cpp
@@ -309,7 +309,7 @@ void QSmoothedAnimation::init()
 /*!
     \qmltype SmoothedAnimation
     \instantiates QQuickSmoothedAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \inherits NumberAnimation
     \brief Allows a property to smoothly track a value
diff --git a/src/quick/util/qquickspringanimation.cpp b/src/quick/util/qquickspringanimation.cpp
index 314d705..b554d30 100644
--- a/src/quick/util/qquickspringanimation.cpp
+++ b/src/quick/util/qquickspringanimation.cpp
@@ -342,7 +342,7 @@ void QQuickSpringAnimationPrivate::updateMode()
 /*!
     \qmltype SpringAnimation
     \instantiates QQuickSpringAnimation
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \inherits NumberAnimation
 
diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp
index c89cea6..57eaead 100644
--- a/src/quick/util/qquickstate.cpp
+++ b/src/quick/util/qquickstate.cpp
@@ -122,7 +122,7 @@ QQuickStateOperation::QQuickStateOperation(QObjectPrivate &dd, QObject *parent)
 /*!
     \qmltype State
     \instantiates QQuickState
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \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 2ad42f6..70033a9 100644
--- a/src/quick/util/qquickstatechangescript.cpp
+++ b/src/quick/util/qquickstatechangescript.cpp
@@ -69,7 +69,7 @@ public:
 /*!
     \qmltype StateChangeScript
     \instantiates QQuickStateChangeScript
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \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 a72a45e..86d0e1e 100644
--- a/src/quick/util/qquickstategroup.cpp
+++ b/src/quick/util/qquickstategroup.cpp
@@ -94,7 +94,7 @@ public:
 /*!
    \qmltype StateGroup
     \instantiates QQuickStateGroup
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
    \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 4eb27e5..8f17ae3 100644
--- a/src/quick/util/qquicksystempalette.cpp
+++ b/src/quick/util/qquicksystempalette.cpp
@@ -59,7 +59,7 @@ public:
 /*!
     \qmltype SystemPalette
     \instantiates QQuickSystemPalette
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-visual-utility
     \brief Provides access to the Qt palettes
 
diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp
index 4db3fbb..423621f 100644
--- a/src/quick/util/qquicktransition.cpp
+++ b/src/quick/util/qquicktransition.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Transition
     \instantiates QQuickTransition
-    \inqmlmodule QtQuick 2
+    \inqmlmodule QtQuick
     \ingroup qtquick-transitions-animations
     \brief Defines animated transitions that occur on state changes