diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index 64f4d5c00095d6c4138bf36545a21b2235e8ddad..0fa0c73ae0fa0baed836521d02c57ab34fae870f 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 f2a7477c1b17f2888b7b5dc0eb0f78eee229cff1..3cf87bf7a3177c0b2c0d4adbaa4f08112d962736 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 bdb8a4bc15445446ab8591a90ba3b7bc812d4f78..e013a0dd37c34280c8cfd311eff712f41941f091 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 02fae8c2924d0a7ce2c7c38291f06db8b8c46ec0..ef23a34db8f1d1b67e915d7aa2ed9a7345b9f282 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 6863758455c90450edba75ef55832c726ac7b076..d247b33e31f5ee8c713af0ded91188cf8cf259a8 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 bb9997593bbff8460937b2489cf275d1227b2bdd..f21abdab67a080753956a03e02f7fdf44957021f 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 09036052dc5fd3e9ee85f39c7e58520f8336e7fc..1930fb69c952afdda7c0476092bf66e15c93316e 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 2025db4fc8c1b68525f87f69631c0ecf24f53ecf..a3c8fc1682dd27016b9a961736aa33c4fc6f97be 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 452cc04c7ba38c8ad7821c14c54a16dd7f4f0ca2..dba8fcaae644fb442bb33b4e46c9650145e5cbb5 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 c7c66d6fddf70b22f8454bb7b389f995039a40ec..a265fed820ee85fdd9634e5576a5a46881ab9f40 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 009a35f25c132c9f1a339f3e40d8b743002611a4..de1fd6b5cf2cc067a865d77fbe3ee44d7d2e8e1f 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 6e571366d36d4c7437894ab669781d0a204020b1..d66c57c667954e86b8073546763535f89b621b1e 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 c12e156354ff7f1eac37e69468fd799ef4929e96..51037508e0662a4058edc73cdd0511188327770d 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 cc1a5ee375417a0eba2324e2a6afe90f271a6ba6..3cfe41f728af5efd1b7f5cf448fde1d164f32006 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 9a97b1efc207641f90605fe9c98fd6890d373075..89ccc2da18e7b4f12b9424ec3df6a1f1f54a393c 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 3428c66a6271c865742d30551ebd79114e37aa1b..85d1b22f852349b804856e87fd82230fee5d2531 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 4091e3229a41b2d140033d2948307b91a0443f06..45ee8bc30596f7a727f33a03d98fc45840fdc455 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 d2710170273eefac6eda88b7e85761e75655cdce..0c6010d13876493d765ac070ac18042ed017ac01 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 be3011b2040f4101a916a341e41d4f2b78ac3f51..682ae237a56d953116c0b2d5459f278973a6e098 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 971d4e01a1144bae9f7461350d6ed299f8aa525b..3ecd5f558dd75c3e8be0ca8e33d875cd0a6a44dc 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 296cce45db1bc51ccaf2e96e9250ce078f8a4091..129751503a974675d302b3e34d38c2b5ecee4758 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 c1cc7c99e04502ab551d684b86c7103e79cb5970..9ccd70133e609164efb516af1d46c96cc869644b 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 1abf2ad719ba6dcbb7db3f4f2346e9869af05837..210f385aac88bbc9eb12c6c55d5acc9e8272f4d2 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 ec71bd4e9301051ece50da3d31bba1024f8062ca..3dee563de294d5bf3c1f0c80e905c63ffd2747ca 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 39f07f2afd08a3f541f22a02134767b3d181d9cc..05ae9f7a32fbcd0cd9aba477a60a660f3a518ee5 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 d6b00cee143b9beaf91b89b78a67340facd9547d..d2a2a5f69f59891399aea2acfb3bca5b872a44ad 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 ff6397c9a07cbc3313a35777b2aa4dad4ee51ece..166379341e4092264985d4d89eb2862c69c836d7 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 434eaa87238ae6d12efd44cdd04d71d6dea372db..0f684943128ef20ae95a6c67156d9493fdabf2e0 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 68721881d79165f7bf02f1afd22eb7b93107648c..0e212315992d56f81ced014dea23caf51b971c56 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 c9f37930e2b4a0046e09260e54f4a1db500a0e01..75415a4c736fad05f145dee170fa7b4ad8b56041 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 d92b3b43d8b61017564ba57ee43d8b65984af921..b51ab270ebdeeaca1f5cac6e2298b15eb5319d0d 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 3a36f1ad6bc565aca7468bd72b3159d4cb85e080..255b1e142d4af6e7f96e5f371b981f728ec829f8 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 7b0fb624e2c2d33225d7d8ad89081ac8b5e5c4a6..0c3d55aafcd53bbab91360b4e04fd3794aaa2c9b 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 46ac19cd7cf870f2961768917c5e90f88cb67ae8..480cb675c5526759de2ea8e05a4117ec47497755 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 b4138308f685305d689912592b75813b25284f68..ff4b8f0b6376758062e731e863658c716255c13c 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 fa15e8ba3ae4b576757645a20a8773a33210d375..13816e89a8ca536155db9aeb5082ec697dd9ade2 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 b1c548f95ea8d0985b9e8d57c81a7585e464816e..27325450a27d63eae0932845e0832df0f2373b7d 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 25c12a240b699d2496431551d8166e1d73bc764c..de26e4397f1e4a9194023f633e5c09030dcb3798 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 63b91d4ada841f60e31fdcea76f08e7964885fc9..6767e3f6c922588885908ece72dfebecb2384714 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 0cbb6e83a9024ee85ee4f10fb63d26634035d479..b5b86993f48aee891ca499fdf3b8738b3dea8cf9 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 43712e115b2b21317be9f5680754d6d144d713e0..4352f50f1a8f6b093e23e1a90dcd916e612706cd 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 904842b91e39a1b6a6279ac97836d88b6ec18d35..60953528f66692b922b3caf667ddae20eb8e9ca3 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 caf1408bb352205562920df883a7ebdad63cb315..ac2075df443e585be1ec01fdb450da8fa23977d2 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 de1cf2641b59db4fba0ad2a66d9495d0a6641e6c..59e2d8c39a05be261b393e2edaed81246488fe01 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 855e99e5a9fe149b986ca8e0971d8e4ba3012aa2..41c7b6375686234b5714109b47e2eee277e4ff86 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 841c7888ce69420b2c1462189f8f2c551d1f9733..d53edb33f1ac9e0c16b758d691637254a62cb15b 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 2278fd25ba3a199060823d66cb0f61e836bea34b..1c766b3286a9c9b009d41f7f952a75e10a30dad7 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 fad7ae9e7e662ba6b07550e0c1771086a7f3dedc..439e79c525d262900761cb1d155bfd085a379367 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 e6f89b9b8979b8acdbf82761689bc6be8ab9ce59..635f6582aacb725316ab57eb772a3b6579e1023d 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 9dd9aa2e6d04bf7609a61b3013cdf4c813d10ece..fda0a90b207f7735ba92c33fa475eef0962161d9 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 314d705f8b9501498fba3af8f7ce49f04ac8da56..b554d30be1f1f01df39c506cdc5d0f7e73105f9a 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 c89cea6767e92a1e4900527937a3204632dad7e4..57eaeade5fde7170fde668dd4c8aacc7fa0178a0 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 2ad42f68fbc937b7073d270fb88bbee8280c48be..70033a95a2f75e215ca3806b74154439ffeb9621 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 a72a45e96b850a6afc98314de0be492a24304371..86d0e1eea8397147b965518a000c271d31560f92 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 4eb27e50243e664eaf139f5428e2ca62416fdd0d..8f17ae321df9d5b679c1ef3989c810e9c876a958 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 4db3fbbad762245cbd7e5dad5ba888462fb6be78..423621f517d937ae577330f7d07f1c1a6cd4606e 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