Create new documentation structure

The documentation currently has no clear separation between Qt QML
and Qt Quick.  With recent commits like:
6c8378eaf1edbbefe6aaa3672b0127816a004fd7
and
ab1e510121c8a679fdaca12ccd30e0f7ac12a26b
the separation between the language definition and implementation,
provided by Qt QML, and the standard library for the QML language,
provided by Qt Quick, is clear.

This commit creates a new documentation structure that is more
navigable and separates concepts into logical categories, with
clear separation between QtQML and QtQuick.  It also provides a more
generic QML Application Developer Resources page which contains links
to information for QML application developers.

Change-Id: Ia807ccfbfd24ffa0e1c7f0a51ed9d2ed3aa6a733
Reviewed-by: Martin Jones <martin.jones@nokia.com>

36 files changed, 57 insertions, 53 deletions

diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 24d71acf26..2d55acee35 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -207,6 +207,7 @@ QQuickCanvasItemPrivate::~QQuickCanvasItemPrivate()
     \since QtQuick 2.0
     \inherits Item
     \ingroup qtquick-canvas
+    \ingroup qtquick-visual
     \brief For specifying a 2D canvas element which enables drawing via Javascript
 
     The Canvas item allows drawing of straight and curved lines, simple and
diff --git a/src/quick/items/qquickaccessibleattached.cpp b/src/quick/items/qquickaccessibleattached.cpp
index 0f1565cfac..1cccc01b74 100644
--- a/src/quick/items/qquickaccessibleattached.cpp
+++ b/src/quick/items/qquickaccessibleattached.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
     \brief Enables accessibility of QML items
 
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-utility
+    \ingroup qtquick-visual-utility
     \ingroup accessibility
 
     This class is part of \l {Accessibility for Qt Quick Applications}.
diff --git a/src/quick/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp
index 97e0f0b4e1..b4c1bd435a 100644
--- a/src/quick/items/qquickanimatedimage.cpp
+++ b/src/quick/items/qquickanimatedimage.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
     \inqmlmodule QtQuick 2
     \inherits Image
     \brief Plays animations stored as a series of images
-    \ingroup qtquick-images
+    \ingroup qtquick-visual
 
     The AnimatedImage element extends the features of the \l Image element, providing
     a way to play animations stored as images containing a series of frames,
diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp
index 79a8d007c7..be1c6a0308 100644
--- a/src/quick/items/qquickanimatedsprite.cpp
+++ b/src/quick/items/qquickanimatedsprite.cpp
@@ -211,7 +211,7 @@ struct AnimatedSpriteVertices {
     \qmlclass AnimatedSprite QQuickAnimatedSprite
     \inqmlmodule QtQuick 2
     \inherits Item
-    \ingroup qtquick-images-sprites
+    \ingroup qtquick-visual
     \brief Draws a sprite animation
 
     AnimatedSprite provides rendering and control over animations which are provided
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp
index 355a745c06..5d4ce7f494 100644
--- a/src/quick/items/qquickborderimage.cpp
+++ b/src/quick/items/qquickborderimage.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
     \inqmlmodule QtQuick 2
     \brief For specifying an image that can be used as a border
     \inherits Item
-    \ingroup qtquick-item-graphics
+    \ingroup qtquick-visual
 
     The BorderImage element is used to create borders out of images by scaling or tiling
     parts of each image.
diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp
index 3cd894349c..82fabd047b 100644
--- a/src/quick/items/qquickcanvas.cpp
+++ b/src/quick/items/qquickcanvas.cpp
@@ -749,7 +749,7 @@ void QQuickCanvasPrivate::cleanup(QSGNode *n)
 /*!
     \qmlclass Window QQuickCanvas
     \inqmlmodule QtQuick.Window 2
-    \ingroup qtquick-visual-types
+    \ingroup qtquick-visual
     \brief Creates a new top-level window
 
     The Window object creates a new top-level window for a QtQuick scene. It automatically sets up the
diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index 722dbb6b97..2357e3a7db 100644
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -108,7 +108,7 @@ public:
 /*!
     \qmlclass Drag QQuickDrag
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-interaction
+    \ingroup qtquick-input
     \brief For specifying drag and drop events for moved Items
 
     Using the Drag attached property any Item can made a source of drag and drop
diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp
index 5080fcdd41..6c178c5c1f 100644
--- a/src/quick/items/qquickdroparea.cpp
+++ b/src/quick/items/qquickdroparea.cpp
@@ -91,7 +91,7 @@ QQuickDropAreaPrivate::~QQuickDropAreaPrivate()
 /*!
     \qmlclass DropArea QQuickDropArea
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-interaction
+    \ingroup qtquick-input
     \brief For specifying drag and drop handling in an area
 
     A DropArea is an invisible item which receives events when other items are
@@ -327,7 +327,7 @@ void QQuickDropArea::dropEvent(QDropEvent *event)
 /*!
     \qmlclass DragEvent QQuickDragEvent
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-interaction
+    \ingroup qtquick-input-events
     \brief Provides information about a drag event
 
     The position of the drag event can be obtained from the \l x and \l y
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index b0aeeb79d3..b2e73af6f7 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmlclass KeyEvent QQuickKeyEvent
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-interaction
+    \ingroup qtquick-input-events
 
     \brief Provides information about a key event
 
@@ -141,7 +141,7 @@ Item {
 /*!
     \qmlclass MouseEvent QQuickMouseEvent
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-interaction
+    \ingroup qtquick-input-events
 
     \brief Provides information about a mouse event
 
@@ -239,8 +239,7 @@ Item {
 /*!
     \qmlclass WheelEvent QQuickWheelEvent
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-interaction
-
+    \ingroup qtquick-input-events
     \brief Provides information about a mouse wheel event
 
     The position of the mouse can be found via the \l x and \l y properties.
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 9e65d962b2..0218aa55f0 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -585,7 +585,7 @@ is finished.
 /*!
     \qmlclass Flickable QQuickFlickable
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-interaction
+    \ingroup qtquick-input
     \ingroup qtquick-containers
 
     \brief For specifying a surface that can be "flicked"
diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp
index 56dc20f762..502b0aa4f9 100644
--- a/src/quick/items/qquickflipable.cpp
+++ b/src/quick/items/qquickflipable.cpp
@@ -91,6 +91,7 @@ public:
     \qmlclass Flipable QQuickFlipable
     \inqmlmodule QtQuick 2
     \inherits Item
+    \ingroup qtquick-input
     \ingroup qtquick-containers
     \brief For specifying a surface that can be flipped
 
diff --git a/src/quick/items/qquickfocusscope.cpp b/src/quick/items/qquickfocusscope.cpp
index 52102a4e32..14a85629ea 100644
--- a/src/quick/items/qquickfocusscope.cpp
+++ b/src/quick/items/qquickfocusscope.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmlclass FocusScope QQuickFocusScope
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-interaction
+    \ingroup qtquick-input
 
     \brief Explicitly creates a focus scope
     \inherits Item
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index 65ca1aee25..dc9a04f1bb 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -1259,7 +1259,7 @@ bool QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
             \image gridview-layout-toptobottom-rtl-btt.png
     \endtable
 
-    \sa {declarative/modelviews/gridview}{GridView example}
+    \sa {quick/modelviews/gridview}{GridView example}
 */
 
 QQuickGridView::QQuickGridView(QQuickItem *parent)
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index 113bb3461e..aa68477a9d 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -94,7 +94,7 @@ QQuickImagePrivate::QQuickImagePrivate()
 /*!
     \qmlclass Image QQuickImage
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-images
+    \ingroup qtquick-visual
     \inherits Item
     \brief Displays an image in a declarative user interface
 
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index e10572fd48..00e01828be 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -129,7 +129,7 @@ void QQuickItemPrivate::registerAccessorProperties()
 /*!
     \qmlclass Transform QQuickTransform
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-transformations
+    \ingroup qtquick-visual-transforms
     \brief For specifying advanced transformations on Items
 
     The Transform element is a base type which cannot be instantiated directly.
@@ -151,7 +151,7 @@ void QQuickItemPrivate::registerAccessorProperties()
 /*!
     \qmlclass Translate QQuickTranslate
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-transformations
+    \ingroup qtquick-visual-transforms
     \brief Provides a way to move an Item without changing its x or y properties
 
     The Translate object provides independent control over position in addition to the Item's x and y properties.
@@ -193,7 +193,7 @@ void QQuickItemPrivate::registerAccessorProperties()
 /*!
     \qmlclass Scale QQuickScale
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-transformations
+    \ingroup qtquick-visual-transforms
     \brief Provides a way to scale an Item
 
     The Scale element gives more control over scaling than using \l Item's \l{Item::scale}{scale} property. Specifically,
@@ -235,7 +235,7 @@ void QQuickItemPrivate::registerAccessorProperties()
 /*!
     \qmlclass Rotation QQuickRotation
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-transformations
+    \ingroup qtquick-visual-transforms
     \brief Provides a way to rotate an Item
 
     The Rotation object gives more control over rotation than using \l Item's \l{Item::rotation}{rotation} property.
@@ -503,7 +503,7 @@ void QQuickItemKeyFilter::componentComplete()
 /*!
     \qmlclass KeyNavigation QQuickKeyNavigationAttached
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-interaction
+    \ingroup qtquick-input
     \brief Supports key navigation by arrow keys
 
     Key-based user interfaces commonly allow the use of arrow keys to navigate between
@@ -917,7 +917,7 @@ bool QQuickKeysAttached::isConnected(const char *signalName)
 /*!
     \qmlclass Keys QQuickKeysAttached
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-interaction
+    \ingroup qtquick-input
     \brief Provides key handling to Items
 
     All visual primitives support key handling via the Keys
@@ -1463,7 +1463,7 @@ QQuickKeysAttached *QQuickKeysAttached::qmlAttachedProperties(QObject *obj)
 /*!
     \qmlclass LayoutMirroring QQuickLayoutMirroringAttached
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-utility
+    \ingroup qtquick-positioners
     \ingroup qml-utility-elements
     \brief Property used to mirror layout behavior
 
@@ -1722,7 +1722,7 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus)
     \qmlclass Item QQuickItem
     \inherits QtObject
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-visual-types
+    \ingroup qtquick-visual
     \brief A basic visual QML type
 
     All visual items in Qt Quick inherit from Item.  Although Item
diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp
index c6e87bb72e..9c8dae2e07 100644
--- a/src/quick/items/qquickitemanimation.cpp
+++ b/src/quick/items/qquickitemanimation.cpp
@@ -560,7 +560,7 @@ QAbstractAnimationJob* QQuickAnchorAnimation::transition(QQuickStateActions &act
 /*!
     \qmlclass PathAnimation QQuickPathAnimation
     \inqmlmodule QtQuick 2
-    \ingroup qml-animation-transition
+    \ingroup qtquick-animation-properties
     \inherits Animation
     \since QtQuick 2.0
     \brief Animates an item along a path
diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp
index 3411d7a34b..01a132452b 100644
--- a/src/quick/items/qquickitemviewtransition.cpp
+++ b/src/quick/items/qquickitemviewtransition.cpp
@@ -568,7 +568,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent)
 /*!
     \qmlclass ViewTransition QQuickViewTransitionAttached
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-animation-properties
+    \ingroup qtquick-transitions-animations
     \brief Specifies items under transition in a view
 
     With ListView and GridView, it is possible to specify transitions that should be applied whenever
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 17851cd76b..5e91ec429a 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -1725,7 +1725,7 @@ bool QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
             \image listview-layout-righttoleft.png
     \endtable
 
-    \sa {QML Data Models}, GridView, {declarative/modelviews/listview}{ListView examples}
+    \sa {QML Data Models}, GridView, {quick/modelviews/listview}{ListView examples}
 */
 QQuickListView::QQuickListView(QQuickItem *parent)
     : QQuickItemView(*(new QQuickListViewPrivate), parent)
@@ -1887,7 +1887,7 @@ QQuickListView::~QQuickListView()
     so as to stay with the current item, unless the highlightFollowsCurrentItem
     property is false.
 
-    \sa highlightItem, highlightFollowsCurrentItem, {declarative/modelviews/listview}{ListView examples}
+    \sa highlightItem, highlightFollowsCurrentItem, {quick/modelviews/listview}{ListView examples}
 */
 
 /*!
@@ -2173,7 +2173,7 @@ void QQuickListView::setOrientation(QQuickListView::Orientation orientation)
     differing sections will result in a section header being created
     even if that section exists elsewhere.
 
-    \sa {declarative/modelviews/listview}{ListView examples}
+    \sa {quick/modelviews/listview}{ListView examples}
 */
 QQuickViewSection *QQuickListView::sectionCriteria()
 {
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index a5740ac467..7945a359cc 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -160,7 +160,7 @@ qreal QQuickLoaderPrivate::getImplicitHeight() const
 /*!
     \qmlclass Loader QQuickLoader
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-utility
+    \ingroup qtquick-dynamic
     \inherits Item
 
     \brief Allows dynamic loading of a subtree from a URL or Component
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index c1d1c9dd8d..f114292ad7 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -311,7 +311,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i
 /*!
     \qmlclass MouseArea QQuickMouseArea
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-interaction
+    \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 f1b4596a14..f980fdce6c 100644
--- a/src/quick/items/qquickmultipointtoucharea.cpp
+++ b/src/quick/items/qquickmultipointtoucharea.cpp
@@ -55,7 +55,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlVisualTouchDebugging, QML_VISUAL_TOUCH_DEBUGGING)
 /*!
     \qmlclass TouchPoint QQuickTouchPoint
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-interaction
+    \ingroup qtquick-input-events
     \brief Describes a touch point in a MultiPointTouchArea
 
     The TouchPoint element contains information about a touch point, such as the current
@@ -225,7 +225,7 @@ void QQuickTouchPoint::setSceneY(qreal sceneY)
     \qmlclass MultiPointTouchArea QQuickMultiPointTouchArea
     \inqmlmodule QtQuick 2
     \inherits Item
-    \ingroup qtquick-interaction
+    \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 883edeca48..1c3b9aaf46 100644
--- a/src/quick/items/qquickpathview.cpp
+++ b/src/quick/items/qquickpathview.cpp
@@ -498,7 +498,7 @@ void QQuickPathViewPrivate::regenerate()
     to set \e {clip: true} in order to have the out of view items clipped
     nicely.
 
-    \sa Path, {declarative/modelviews/pathview}{PathView example}
+    \sa Path, {quick/modelviews/pathview}{PathView example}
 */
 
 QQuickPathView::QQuickPathView(QQuickItem *parent)
diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp
index 90885d12c9..8c1c7bd096 100644
--- a/src/quick/items/qquickpincharea.cpp
+++ b/src/quick/items/qquickpincharea.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmlclass PinchEvent QQuickPinchEvent
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-interaction
+    \ingroup qtquick-input-events
     \brief For specifying information about a pinch event
 
     \b {The PinchEvent element was added in QtQuick 1.1}
@@ -163,7 +163,7 @@ QQuickPinchAreaPrivate::~QQuickPinchAreaPrivate()
 /*!
     \qmlclass PinchArea QQuickPinchArea
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-interaction
+    \ingroup qtquick-input
     \inherits Item
     \brief Enables simple pinch gesture handling
 
diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp
index f912d57954..3137ba93fd 100644
--- a/src/quick/items/qquickrectangle.cpp
+++ b/src/quick/items/qquickrectangle.cpp
@@ -130,7 +130,7 @@ bool QQuickPen::isValid() const
 /*!
     \qmlclass GradientStop QQuickGradientStop
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-item-graphics
+    \ingroup qtquick-visual-utility
     \brief Defines the color at a position in a Gradient
 
     \sa Gradient
@@ -181,7 +181,7 @@ void QQuickGradientStop::updateGradient()
 /*!
     \qmlclass Gradient QQuickGradient
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-item-graphics
+    \ingroup qtquick-visual-utility
     \brief Defines a gradient fill
 
     A gradient is defined by two or more colors, which will be blended seamlessly.
@@ -281,7 +281,7 @@ int QQuickRectanglePrivate::doUpdateSlotIdx = -1;
     \qmlclass Rectangle QQuickRectangle
     \inqmlmodule QtQuick 2
     \inherits Item
-    \ingroup qtquick-visual-types
+    \ingroup qtquick-visual
     \brief Describes a filled rectangle with an optional border
 
     Rectangle items are used to fill areas with solid color or gradients, and are
diff --git a/src/quick/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp
index 8d034e5839..c688fade92 100644
--- a/src/quick/items/qquickrepeater.cpp
+++ b/src/quick/items/qquickrepeater.cpp
@@ -65,6 +65,7 @@ QQuickRepeaterPrivate::~QQuickRepeaterPrivate()
     \qmlclass Repeater QQuickRepeater
     \inqmlmodule QtQuick 2
     \ingroup qtquick-models
+    \ingroup qtquick-positioning
     \inherits Item
     \brief Specifies how to repeately create an Item-based component using a model
 
diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
index c3d32eb1c3..17f4ebc1f0 100644
--- a/src/quick/items/qquickscreen.cpp
+++ b/src/quick/items/qquickscreen.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmlclass Screen QQuickScreenAttached
     \inqmlmodule QtQuick.Window 2
-    \ingroup qtquick-utility
+    \ingroup qtquick-visual-utility
     \brief The Screen attached object provides information about the Screen an Item is displayed on.
 
     The Screen attached object is only valid inside Item or Item derived elements, after component completion.
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp
index c14b8f2f29..ebc7d8f684 100644
--- a/src/quick/items/qquickshadereffect.cpp
+++ b/src/quick/items/qquickshadereffect.cpp
@@ -536,7 +536,7 @@ void QQuickShaderEffectCommon::propertyChanged(QQuickItem *item, int mappedId,
     \qmlclass ShaderEffect QQuickShaderEffect
     \inqmlmodule QtQuick 2
     \inherits Item
-    \ingroup qtquick-shaders
+    \ingroup qtquick-effects
     \brief Applies custom shaders to a rectangle
 
     The ShaderEffect element applies a custom OpenGL
diff --git a/src/quick/items/qquickshadereffectmesh.cpp b/src/quick/items/qquickshadereffectmesh.cpp
index a0d589780b..d1110c5a5b 100644
--- a/src/quick/items/qquickshadereffectmesh.cpp
+++ b/src/quick/items/qquickshadereffectmesh.cpp
@@ -53,7 +53,7 @@ QQuickShaderEffectMesh::QQuickShaderEffectMesh(QObject *parent)
 /*!
     \qmlclass GridMesh QQuickGridMesh
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-shaders
+    \ingroup qtquick-effects
     \brief Defines a mesh with vertices arranged in a grid
 
     GridMesh defines a rectangular mesh consisting of vertices arranged in an
diff --git a/src/quick/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp
index 7fbab0d604..71a0aafe4b 100644
--- a/src/quick/items/qquickshadereffectsource.cpp
+++ b/src/quick/items/qquickshadereffectsource.cpp
@@ -456,7 +456,7 @@ QImage QQuickShaderEffectTexture::toImage() const
     \qmlclass ShaderEffectSource QQuickShaderEffectSource
     \since 5.0
     \inherits Item
-    \ingroup qtquick-shaders
+    \ingroup qtquick-effects
     \brief Renders a QML element into a texture and displays it
 
     The ShaderEffectSource element renders \l sourceItem into a texture and
diff --git a/src/quick/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp
index 1628ed7633..8d56612a6c 100644
--- a/src/quick/items/qquicksprite.cpp
+++ b/src/quick/items/qquicksprite.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmlclass Sprite QQuickSprite
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-images-sprites
+    \ingroup qtquick-visual-utility
     \brief Specifies sprite animations
 
     QQuickSprite renders sprites of one or more frames and animates them. The sprites
diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp
index 0e7d998fbb..feb43a4e3d 100644
--- a/src/quick/items/qquickspritesequence.cpp
+++ b/src/quick/items/qquickspritesequence.cpp
@@ -209,7 +209,7 @@ struct SpriteVertices {
 /*!
     \qmlclass SpriteSequence QQuickSpriteSequence
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-images-sprites
+    \ingroup qtquick-visual-utility
     \inherits Item
     \brief Draws a sprite animation
 
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 4ab56494a0..f03afd657a 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -1139,7 +1139,7 @@ void QQuickTextPrivate::ensureDoc()
 /*!
     \qmlclass Text QQuickText
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-text
+    \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 4b55ff1bd5..058b8161c4 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -67,7 +67,8 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmlclass TextEdit QQuickTextEdit
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-text
+    \ingroup qtquick-visual
+    \ingroup qtquick-input
     \inherits Item
     \brief Displays multiple lines of editable formatted text
 
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 477cf1c222..a8d10f3daf 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -68,7 +68,8 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
 /*!
     \qmlclass TextInput QQuickTextInput
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-text
+    \ingroup qtquick-visual
+    \ingroup qtquick-input
     \inherits Item
     \brief Displays an editable line of text
 
@@ -844,7 +845,7 @@ void QQuickTextInput::setAutoScroll(bool b)
 /*!
     \qmlclass IntValidator QIntValidator
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-text-validator
+    \ingroup qtquick-text-utility
     \brief Defines a validator for integer values
 
     This element provides a validator for integer values.
@@ -907,7 +908,7 @@ void QQuickIntValidator::resetLocaleName()
 /*!
     \qmlclass DoubleValidator QDoubleValidator
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-text-validator
+    \ingroup qtquick-text-utility
     \brief Defines a validator for non-integer numbers
 
     This element provides a validator for non-integer numbers.
@@ -1000,7 +1001,7 @@ void QQuickDoubleValidator::resetLocaleName()
 /*!
     \qmlclass RegExpValidator QRegExpValidator
     \inqmlmodule QtQuick 2
-    \ingroup qtquick-text-validator
+    \ingroup qtquick-text-utility
     \brief Provides a string validator
 
     This element provides a validator, which counts as valid any string which
diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp
index b3fba60fb8..20575d4af9 100644
--- a/src/quick/items/qquickview.cpp
+++ b/src/quick/items/qquickview.cpp
@@ -144,7 +144,7 @@ void QQuickViewPrivate::itemGeometryChanged(QQuickItem *resizeItem, const QRectF
     you can connect to the statusChanged() signal and monitor for QQuickView::Error.
     The errors are available via QQuickView::errors().
 
-    \sa {Using QML Bindings in C++ Applications}
+    \sa {Exposing C++ Data to QML}
 */
 
 
diff --git a/src/quick/items/qquickvisualitemmodel.cpp b/src/quick/items/qquickvisualitemmodel.cpp
index 2cd9106c4a..8405a41c80 100644
--- a/src/quick/items/qquickvisualitemmodel.cpp
+++ b/src/quick/items/qquickvisualitemmodel.cpp
@@ -150,7 +150,7 @@ public:
 
     \image visualitemmodel.png
 
-    \sa {declarative/modelviews/visualitemmodel}{VisualItemModel example}
+    \sa {quick/modelviews/visualitemmodel}{VisualItemModel example}
 */
 QQuickVisualItemModel::QQuickVisualItemModel(QObject *parent)
     : QQuickVisualModel(*(new QQuickVisualItemModelPrivate), parent)