Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt

Conflicts:
	doc/src/declarative/advtutorial1.qdoc
	src/declarative/qml/qmlmoduleplugin.cpp
	src/declarative/util/qmlxmllistmodel.cpp

25 files changed, 84 insertions, 19 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
index cde9ec7..72b4717 100644
--- a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
@@ -123,6 +123,7 @@ static qreal adjustedPosition(QmlGraphicsItem *item, QmlGraphicsAnchorLine::Anch
 /*!
     \internal
     \class QmlGraphicsAnchors
+    \since 4.7
     \ingroup group_layouts
     \brief The QmlGraphicsAnchors class provides a way to lay out items relative to other items.
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
index 697be15..4dea33c 100644
--- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
@@ -58,6 +58,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmlclass AnimatedImage QmlGraphicsAnimatedImage
     \inherits Image
+    \since 4.7
 
     This item provides for playing animations stored as images containing a series of frames,
     such as GIF files. The full list of supported formats can be determined with
diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
index f739464..25a220f 100644
--- a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
@@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE
     \qmlclass BorderImage QmlGraphicsBorderImage
     \brief The BorderImage element provides an image that can be used as a border.
     \inherits Item
+    \since 4.7
 
     \snippet snippets/declarative/border-image.qml 0
 
@@ -61,8 +62,8 @@ QT_BEGIN_NAMESPACE
  */
 
 /*!
-    \internal
     \class QmlGraphicsBorderImage BorderImage
+    \internal
     \brief The QmlGraphicsBorderImage class provides an image item that you can add to a QmlView.
 */
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsevents.cpp b/src/declarative/graphicsitems/qmlgraphicsevents.cpp
index efd7b4a..e8ba885 100644
--- a/src/declarative/graphicsitems/qmlgraphicsevents.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsevents.cpp
@@ -44,6 +44,7 @@
 QT_BEGIN_NAMESPACE
 /*!
     \qmlclass KeyEvent QmlGraphicsKeyEvent
+    \since 4.7
     \brief The KeyEvent object provides information about a key event.
 
     For example, the following changes the Item's state property when the Enter
diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
index 5bab868..f51c203 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
@@ -64,6 +64,7 @@ public:
 
 /*!
     \qmlclass Flipable QmlGraphicsFlipable
+    \since 4.7
     \brief The Flipable item provides a surface that can be flipped.
     \inherits Item
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp b/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp
index d564e86..4d7af54 100644
--- a/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
    \qmlclass FocusPanel QmlGraphicsFocusPanel
+    \since 4.7
    \brief The FocusPanel item explicitly creates a focus panel.
    \inherits Item
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp b/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp
index 9930396..bba471a 100644
--- a/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass FocusScope QmlGraphicsFocusScope
+    \since 4.7
     \brief The FocusScope object explicitly creates a focus scope.
     \inherits Item
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp
index 497d950..692f7a9 100644
--- a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp
@@ -83,6 +83,7 @@ public:
 
 /*!
     \qmlclass GraphicsObjectContainer QmlGraphicsGraphicsObjectContainer
+    \since 4.7
     \brief The GraphicsObjectContainer element allows you to add QGraphicsObjects into Fluid UI elements.
 
     While any QObject based class can be exposed to QML, QmlGraphicsItem
diff --git a/src/declarative/graphicsitems/qmlgraphicsimage.cpp b/src/declarative/graphicsitems/qmlgraphicsimage.cpp
index c586452..6e93c52 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimage.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsimage.cpp
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Image QmlGraphicsImage
+    \since 4.7
     \brief The Image element allows you to add bitmaps to a scene.
     \inherits Item
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
index 2e68264..fce4e36 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
@@ -73,6 +73,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Transform QGraphicsTransform
+    \since 4.7
     \brief The Transform elements provide a way of building advanced transformations on Items.
 
     The Transform elements let you create and control advanced transformations that can be configured
@@ -86,6 +87,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Scale QGraphicsScale
+    \since 4.7
     \brief The Scale object provides a way to scale an Item.
 
     The Scale object gives more control over scaling than using Item's scale property. Specifically,
@@ -124,6 +126,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Rotation QGraphicsRotation
+    \since 4.7
     \brief The Rotation object provides a way to rotate an Item.
 
     The Rotation object gives more control over rotation than using Item's rotation property.
@@ -363,6 +366,7 @@ void QmlGraphicsItemKeyFilter::componentComplete()
 
 /*!
     \qmlclass KeyNavigation
+    \since 4.7
     \brief The KeyNavigation attached property supports key navigation by arrow keys.
 
     It is common in key-based UIs to use arrow keys to navigate
@@ -568,6 +572,7 @@ void QmlGraphicsKeyNavigationAttached::keyReleased(QKeyEvent *event)
 
 /*!
     \qmlclass Keys
+    \since 4.7
     \brief The Keys attached property provides key handling to Items.
 
     All visual primitives support key handling via the \e Keys
@@ -1078,6 +1083,7 @@ QmlGraphicsKeysAttached *QmlGraphicsKeysAttached::qmlAttachedProperties(QObject
 
 /*!
     \class QmlGraphicsItem
+    \since 4.7
     \brief The QmlGraphicsItem class provides the most basic of all visual items in QML.
 
     All visual items in Qt Declarative inherit from QmlGraphicsItem.  Although QmlGraphicsItem
@@ -1091,6 +1097,7 @@ QmlGraphicsKeysAttached *QmlGraphicsKeysAttached::qmlAttachedProperties(QObject
 
 /*!
     \qmlclass Item QmlGraphicsItem
+    \since 4.7
     \brief The Item is the most basic of all visual items in QML.
 
     All visual items in Qt Declarative inherit from Item.  Although Item
diff --git a/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp b/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp
index 961065e..b55beda 100644
--- a/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp
@@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass LayoutItem QmlGraphicsLayoutItem
+    \since 4.7
     \brief The LayoutItem element allows you to place your Fluid UI elements inside a classical Qt layout.
 
     LayoutItem is a variant of Item with a couple of additional properties. These properties provide the size hints
diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
index 108ac75..28b21c9 100644
--- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
@@ -1337,6 +1337,7 @@ void QmlGraphicsListViewPrivate::flickY(qreal velocity)
 
 /*!
     \qmlclass ListView QmlGraphicsListView
+    \since 4.7
     \inherits Flickable
     \brief The ListView item provides a list view of items provided by a model.
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsloader.cpp b/src/declarative/graphicsitems/qmlgraphicsloader.cpp
index e4c7411..b9780f2 100644
--- a/src/declarative/graphicsitems/qmlgraphicsloader.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsloader.cpp
@@ -110,6 +110,7 @@ void QmlGraphicsLoaderPrivate::initResize()
 
 /*!
     \qmlclass Loader QmlGraphicsLoader
+    \since 4.7
     \inherits Item
 
     \brief The Loader item allows dynamically loading an Item-based
diff --git a/src/declarative/graphicsitems/qmlgraphicsmousearea.cpp b/src/declarative/graphicsitems/qmlgraphicsmousearea.cpp
index cc07989..07354f4 100644
--- a/src/declarative/graphicsitems/qmlgraphicsmousearea.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsmousearea.cpp
@@ -143,7 +143,8 @@ QmlGraphicsMouseAreaPrivate::~QmlGraphicsMouseAreaPrivate()
 
 
 /*!
-    \qmlclass MouseArea QmlGraphicsMouseArea
+    \qmlclass MouseRegion QmlGraphicsMouseRegion
+    \since 4.7
     \brief The MouseArea item enables simple mouse handling.
     \inherits Item
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
index e23f6f0..93127bc 100644
--- a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
@@ -155,6 +155,7 @@ void QmlGraphicsParticleMotion::destroy(QmlGraphicsParticle &particle)
 
 /*!
     \qmlclass ParticleMotionLinear
+    \since 4.7
     \brief The ParticleMotionLinear object moves particles linearly.
 
     \sa Particles
@@ -175,6 +176,7 @@ void QmlGraphicsParticleMotionLinear::advance(QmlGraphicsParticle &p, int interv
 
 /*!
     \qmlclass ParticleMotionGravity
+    \since 4.7
     \brief The ParticleMotionGravity object moves particles towards a point.
 
     \sa Particles
@@ -255,6 +257,7 @@ void QmlGraphicsParticleMotionGravity::advance(QmlGraphicsParticle &p, int inter
 
 /*!
     \qmlclass ParticleMotionWander
+    \since 4.7
     \brief The ParticleMotionWander object moves particles in a somewhat random fashion.
 
     The particles will continue roughly in the original direction, however will randomly
@@ -607,19 +610,25 @@ void QmlGraphicsParticlesPrivate::updateOpacity(QmlGraphicsParticle &p, int age)
 
 /*!
     \qmlclass Particles
+    \since 4.7
     \brief The Particles object generates and moves particles.
     \inherits Item
 
-    This element provides preliminary support for particles in QML, and may be heavily changed or removed in later versions.
+    This element provides preliminary support for particles in QML,
+    and may be heavily changed or removed in later versions.
 
-    The particles created by this object cannot be dealt with directly, they can only be controlled through the parameters of the Particles object. The particles are all the same pixmap, specified by the user.
+    The particles created by this object cannot be dealt with
+    directly, they can only be controlled through the parameters of
+    the Particles object. The particles are all the same pixmap,
+    specified by the user.
 
-    The particles are painted relative to the parent of the Particles object.  Moving the
-    Particles object will not move the particles already emitted.
+    The particles are painted relative to the parent of the Particles
+    object.  Moving the Particles object will not move the particles
+    already emitted.
 
-    The below example creates two differently behaving particle sources.
-    The top one has particles falling from the top like snow,
-    the lower one has particles expelled up like a fountain.
+    The below example creates two differently behaving particle
+    sources.  The top one has particles falling from the top like
+    snow, the lower one has particles expelled up like a fountain.
 
     \qml
 Rectangle {
diff --git a/src/declarative/graphicsitems/qmlgraphicspath.cpp b/src/declarative/graphicsitems/qmlgraphicspath.cpp
index 4e4459d..0da246f 100644
--- a/src/declarative/graphicsitems/qmlgraphicspath.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspath.cpp
@@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass PathElement QmlGraphicsPathElement
+    \since 4.7
     \brief PathElement is the base path type.
 
     This type is the base for all path types.  It cannot
@@ -68,6 +69,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Path QmlGraphicsPath
+    \since 4.7
     \brief A Path object defines a path for use by \l PathView.
 
     A Path is composed of one or more path segments - PathLine, PathQuad,
@@ -468,6 +470,7 @@ void QmlGraphicsCurve::setY(qreal y)
 
 /*!
     \qmlclass PathAttribute QmlGraphicsPathAttribute
+    \since 4.7
     \brief The PathAttribute allows setting an attribute at a given position in a Path.
 
     The PathAttribute object allows attibutes consisting of a name and
@@ -547,6 +550,7 @@ void QmlGraphicsPathAttribute::setValue(qreal value)
 
 /*!
     \qmlclass PathLine QmlGraphicsPathLine
+    \since 4.7
     \brief The PathLine defines a straight line.
 
     The example below creates a path consisting of a straight line from
@@ -587,6 +591,7 @@ void QmlGraphicsPathLine::addToPath(QPainterPath &path)
 
 /*!
     \qmlclass PathQuad QmlGraphicsPathQuad
+    \since 4.7
     \brief The PathQuad defines a quadratic Bezier curve with a control point.
 
     The following QML produces the path shown below:
@@ -671,6 +676,7 @@ void QmlGraphicsPathQuad::addToPath(QPainterPath &path)
 
 /*!
    \qmlclass PathCubic QmlGraphicsPathCubic
+    \since 4.7
    \brief The PathCubic defines a cubic Bezier curve with two control points.
 
     The following QML produces the path shown below:
@@ -781,6 +787,7 @@ void QmlGraphicsPathCubic::addToPath(QPainterPath &path)
 
 /*!
     \qmlclass PathPercent QmlGraphicsPathPercent
+    \since 4.7
     \brief The PathPercent manipulates the way a path is interpreted.
 
     The examples below show the normal distrubution of items along a path
diff --git a/src/declarative/graphicsitems/qmlgraphicspathview.cpp b/src/declarative/graphicsitems/qmlgraphicspathview.cpp
index aba184d..9a2c24d 100644
--- a/src/declarative/graphicsitems/qmlgraphicspathview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspathview.cpp
@@ -135,6 +135,7 @@ void QmlGraphicsPathViewPrivate::releaseItem(QmlGraphicsItem *item)
 
 /*!
     \qmlclass PathView QmlGraphicsPathView
+    \since 4.7
     \brief The PathView element lays out model-provided items on a path.
     \inherits Item
 
diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
index 805c912..fb71495 100644
--- a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
@@ -297,6 +297,7 @@ void QmlGraphicsBasePositioner::finishApplyTransitions()
 
 /*!
   \qmlclass Column QmlGraphicsColumn
+    \since 4.7
   \brief The Column item lines up its children vertically.
   \inherits Item
 
@@ -346,19 +347,28 @@ Column {
 */
 /*!
     \qmlproperty Transition Column::add
-    This property holds the transition to be applied when adding an item to the positioner. The transition will only be applied to the added item(s).
-    Positioner transitions will only affect the position (x,y) of items.
 
-    Added can mean that either the object has been created or reparented, and thus is now a child or the positioner, or that the object has had its opacity increased from zero, and thus is now visible.
+    This property holds the transition to be applied when adding an
+    item to the positioner. The transition will only be applied to the
+    added item(s).  Positioner transitions will only affect the
+    position (x,y) of items.
+
+    Added can mean that either the object has been created or
+    reparented, and thus is now a child or the positioner, or that the
+    object has had its opacity increased from zero, and thus is now
+    visible.
 
 
 */
 /*!
     \qmlproperty Transition Column::move
-    This property holds the transition to apply when moving an item within the positioner.
-    Positioner transitions will only affect the position (x,y) of items.
 
-    This can happen when other items are added or removed from the positioner, or when items resize themselves.
+    This property holds the transition to apply when moving an item
+    within the positioner.  Positioner transitions will only affect
+    the position (x,y) of items.
+
+    This can happen when other items are added or removed from the
+    positioner, or when items resize themselves.
 
     \table
     \row
@@ -426,6 +436,7 @@ void QmlGraphicsColumn::doPositioning()
 
 /*!
   \qmlclass Row QmlGraphicsRow
+  \since 4.7
   \brief The Row item lines up its children horizontally.
   \inherits Item
 
@@ -461,16 +472,22 @@ Row {
     The transition will only be applied to the added item(s).
     Positioner transitions will only affect the position (x,y) of items.
 
-    Added can mean that either the object has been created or reparented, and thus is now a child or the positioner, or that the object has had its opacity increased from zero, and thus is now visible.
+    Added can mean that either the object has been created or
+    reparented, and thus is now a child or the positioner, or that the
+    object has had its opacity increased from zero, and thus is now
+    visible.
 
 
 */
 /*!
     \qmlproperty Transition Row::move
-    This property holds the transition to apply when moving an item within the positioner.
-    Positioner transitions will only affect the position (x,y) of items.
 
-    This can happen when other items are added or removed from the positioner, or when items resize themselves.
+    This property holds the transition to apply when moving an item
+    within the positioner.  Positioner transitions will only affect
+    the position (x,y) of items.
+
+    This can happen when other items are added or removed from the
+    positioner, or when items resize themselves.
 
     \qml
 Row {
@@ -531,6 +548,7 @@ void QmlGraphicsRow::doPositioning()
 
 /*!
   \qmlclass Grid QmlGraphicsGrid
+  \since 4.7
   \brief The Grid item positions its children in a grid.
   \inherits Item
 
@@ -735,6 +753,7 @@ void QmlGraphicsGrid::doPositioning()
 
 /*!
   \qmlclass Flow QmlGraphicsFlow
+  \since 4.7
   \brief The Flow item lines up its children side by side, wrapping as necessary.
   \inherits Item
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp b/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp
index f357ed0..adc4cf3 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp
@@ -83,6 +83,7 @@ void QmlGraphicsPen::setWidth(int w)
 
 /*!
     \qmlclass GradientStop QmlGraphicsGradientStop
+  \since 4.7
     \brief The GradientStop item defines the color at a position in a Gradient
 
     \sa Gradient
@@ -103,6 +104,7 @@ void QmlGraphicsGradientStop::updateGradient()
 
 /*!
     \qmlclass Gradient QmlGraphicsGradient
+  \since 4.7
     \brief The Gradient item defines a gradient fill.
 
     A gradient is defined by two or more colors, which will be blended seemlessly.  The
@@ -149,6 +151,7 @@ void QmlGraphicsGradient::doUpdate()
 
 /*!
     \qmlclass Rectangle QmlGraphicsRectangle
+  \since 4.7
     \brief The Rectangle item allows you to add rectangles to a scene.
     \inherits Item
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
index fc78ef8..23c3aae 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
@@ -62,6 +62,7 @@ QmlGraphicsRepeaterPrivate::~QmlGraphicsRepeaterPrivate()
 
 /*!
     \qmlclass Repeater QmlGraphicsRepeater
+  \since 4.7
     \inherits Item
 
     \brief The Repeater item allows you to repeat a component based on a model.
diff --git a/src/declarative/graphicsitems/qmlgraphicstext.cpp b/src/declarative/graphicsitems/qmlgraphicstext.cpp
index 409fa3a..57b44d2 100644
--- a/src/declarative/graphicsitems/qmlgraphicstext.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstext.cpp
@@ -58,6 +58,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Text QmlGraphicsText
+  \since 4.7
     \brief The Text item allows you to add formatted text to a scene.
     \inherits Item
 
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
index 3dadbe0..364751d 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
@@ -59,6 +59,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass TextEdit QmlGraphicsTextEdit
+  \since 4.7
     \brief The TextEdit item allows you to add editable formatted text to a scene.
 
     It can display both plain and rich text. For example:
diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
index 6b4407f..d3c1f1f 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
@@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass TextInput QmlGraphicsTextInput
+  \since 4.7
     The TextInput item allows you to add an editable line of text to a scene.
 
     TextInput can only display a single line of text, and can only display
diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
index bf3df03..97e4a97 100644
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
@@ -99,6 +99,7 @@ public:
 
 /*!
     \qmlclass VisualItemModel QmlGraphicsVisualItemModel
+  \since 4.7
     \brief The VisualItemModel allows items to be provided to a view.
 
     The children of the VisualItemModel are provided in a model which
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
index f9bbb22..92ec4c4 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
@@ -114,6 +114,7 @@ public:
 
 /*!
     \qmlclass WebView QmlGraphicsWebView
+  \since 4.7
     \brief The WebView item allows you to add web content to a canvas.
     \inherits Item