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

Conflicts:
	src/declarative/qml/qml.h

47 files changed, 124 insertions, 27 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
 
diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h
index 34873a2..7cde731 100644
--- a/src/declarative/qml/qml.h
+++ b/src/declarative/qml/qml.h
@@ -55,8 +55,6 @@
 
 QT_BEGIN_HEADER
 
-QT_MODULE(Declarative)
-
 #define QML_DECLARE_TYPE(TYPE) \
     Q_DECLARE_METATYPE(TYPE *) \
     Q_DECLARE_METATYPE(QmlListProperty<TYPE>) 
@@ -88,6 +86,8 @@ QT_END_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Declarative)
+
 #define QML_REGISTER_INTERFACE(INTERFACE) \
     qmlRegisterInterface<INTERFACE>(#INTERFACE)
 
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 4365b17..3702d0b 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -123,10 +123,9 @@ bool QmlCompiler::isValidId(const QString &val)
     if (val.isEmpty())
         return false;
 
-    // TODO this will be enforced and return false
     if (val.at(0).isLetter() && !val.at(0).isLower()) {
-        //return false;
-        qWarning().nospace() << "id '" << val << "' is invalid: ids cannot start with uppercase letters. This will be enforced in an upcoming version of QML.";
+        qWarning().nospace() << "id " << val << " is invalid: ids cannot start with uppercase letters";
+        return false;
     }
 
     QChar u(QLatin1Char('_'));
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 1e1289e..cda281f 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -69,12 +69,14 @@ int statusId = qRegisterMetaType<QmlComponent::Status>("QmlComponent::Status");
 
 /*!
     \class QmlComponent
+  \since 4.7
     \brief The QmlComponent class encapsulates a QML component description.
     \mainclass
 */
 
 /*!
     \qmlclass Component QmlComponent
+  \since 4.7
     \brief The Component element encapsulates a QML component description.
 
     Components are reusable, encapsulated Qml element with a well-defined interface.
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index 56038cf..1718387 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -130,6 +130,7 @@ void QmlContextPrivate::init()
 
 /*!
     \class QmlContext
+  \since 4.7
     \brief The QmlContext class defines a context within a QML engine.
     \mainclass
 
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 1c40ac7..2d904d1 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -117,6 +117,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE)
 
 /*!
     \qmlclass QtObject QObject
+  \since 4.7
     \brief The QtObject element is the most basic element in QML
 
     The QtObject element is a non-visual element which contains only
@@ -371,6 +372,7 @@ QmlWorkerScriptEngine *QmlEnginePrivate::getWorkerScriptEngine()
 
 /*!
     \class QmlEngine
+  \since 4.7
     \brief The QmlEngine class provides an environment for instantiating QML components.
     \mainclass
 
diff --git a/src/declarative/qml/qmlerror.cpp b/src/declarative/qml/qmlerror.cpp
index 5ba7719..fc4bcd5 100644
--- a/src/declarative/qml/qmlerror.cpp
+++ b/src/declarative/qml/qmlerror.cpp
@@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QmlError
+  \since 4.7
     \brief The QmlError class encapsulates a QML error
 */
 class QmlErrorPrivate
diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp
index 64b2d7f..217f002 100644
--- a/src/declarative/qml/qmlexpression.cpp
+++ b/src/declarative/qml/qmlexpression.cpp
@@ -187,6 +187,7 @@ QScriptValue QmlExpressionPrivate::evalInObjectScope(QmlContext *context, QObjec
 
 /*!
     \class QmlExpression
+  \since 4.7
     \brief The QmlExpression class evaluates JavaScript in a QML context.
 */
 
diff --git a/src/declarative/qml/qmllist.h b/src/declarative/qml/qmllist.h
index cedc35b..5528d8d 100644
--- a/src/declarative/qml/qmllist.h
+++ b/src/declarative/qml/qmllist.h
@@ -133,10 +133,11 @@ private:
     friend class QmlListReferencePrivate;
     QmlListReferencePrivate* d;
 };
-Q_DECLARE_METATYPE(QmlListReference);
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QmlListReference);
+
 QT_END_HEADER
 
 #endif // QMLLIST_H
diff --git a/src/declarative/qml/qmlnetworkaccessmanagerfactory.cpp b/src/declarative/qml/qmlnetworkaccessmanagerfactory.cpp
index 1ba0694..455d09e 100644
--- a/src/declarative/qml/qmlnetworkaccessmanagerfactory.cpp
+++ b/src/declarative/qml/qmlnetworkaccessmanagerfactory.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QmlNetworkAccessManagerFactory
+  \since 4.7
     \brief The QmlNetworkAccessManagerFactory class provides a factory for QNetworkAccessManager
 
     QNetworkAccessManager is used for all network access by QML.
diff --git a/src/declarative/qml/qmlparserstatus.cpp b/src/declarative/qml/qmlparserstatus.cpp
index 435d620..315bc75 100644
--- a/src/declarative/qml/qmlparserstatus.cpp
+++ b/src/declarative/qml/qmlparserstatus.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QmlParserStatus
+  \since 4.7
     \brief The QmlParserStatus class provides updates on the parser state.
 */
 
diff --git a/src/declarative/qml/qmlscriptstring.cpp b/src/declarative/qml/qmlscriptstring.cpp
index 29118e6..a80f66b 100644
--- a/src/declarative/qml/qmlscriptstring.cpp
+++ b/src/declarative/qml/qmlscriptstring.cpp
@@ -55,6 +55,7 @@ public:
 
 /*!
 \class QmlScriptString
+  \since 4.7
 \brief The QmlScriptString class encapsulates a script and its context.
 
 The QmlScriptString is used by properties that want to accept a script "assignment" from QML.
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 63ded23..cd1458c 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -68,6 +68,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Animation QmlAbstractAnimation
+  \since 4.7
     \brief The Animation element is the base of all QML animations.
 
     The Animation element cannot be used directly in a QML file.  It exists
@@ -514,6 +515,7 @@ void QmlAbstractAnimation::timelineComplete()
 
 /*!
     \qmlclass PauseAnimation QmlPauseAnimation
+  \since 4.7
     \inherits Animation
     \brief The PauseAnimation element provides a pause for an animation.
 
@@ -587,6 +589,7 @@ QAbstractAnimation *QmlPauseAnimation::qtAnimation()
 
 /*!
     \qmlclass ColorAnimation QmlColorAnimation
+  \since 4.7
     \inherits PropertyAnimation
     \brief The ColorAnimation element allows you to animate color changes.
 
@@ -650,6 +653,7 @@ void QmlColorAnimation::setTo(const QColor &t)
 
 /*!
     \qmlclass ScriptAction QmlScriptAction
+  \since 4.7
     \inherits Animation
     \brief The ScriptAction element allows scripts to be run during an animation.
 
@@ -755,6 +759,7 @@ QAbstractAnimation *QmlScriptAction::qtAnimation()
 
 /*!
     \qmlclass PropertyAction QmlPropertyAction
+  \since 4.7
     \inherits Animation
     \brief The PropertyAction element allows immediate property changes during animation.
 
@@ -1003,6 +1008,7 @@ void QmlPropertyAction::transition(QmlStateActions &actions,
 
 /*!
     \qmlclass ParentAction QmlParentAction
+  \since 4.7
     \inherits Animation
     \brief The ParentAction element allows parent changes during animation.
 
@@ -1206,6 +1212,7 @@ void QmlParentAction::transition(QmlStateActions &actions,
 
 /*!
     \qmlclass NumberAnimation QmlNumberAnimation
+  \since 4.7
     \inherits PropertyAnimation
     \brief The NumberAnimation element allows you to animate changes in properties of type qreal.
 
@@ -1269,6 +1276,7 @@ void QmlNumberAnimation::setTo(qreal t)
 
 /*!
     \qmlclass Vector3dAnimation QmlVector3dAnimation
+  \since 4.7
     \inherits PropertyAnimation
     \brief The Vector3dAnimation element allows you to animate changes in properties of type QVector3d.
 */
@@ -1444,7 +1452,7 @@ void QmlRotationAnimation::setTo(qreal t)
     Possible values are Numerical, Clockwise, Counterclockwise,
     or Shortest.
 
-    \list
+    \table
     \row
         \o Numerical
         \o Rotate by linearly interpolating between the two numbers.
@@ -1459,7 +1467,7 @@ void QmlRotationAnimation::setTo(qreal t)
         \o Shortest
         \o Rotate in the direction that produces the shortest animation path.
            A rotation from 10 to 350 will rotate 20 degrees counterclockwise.
-    \list
+    \endtable
 
     The default direction is Shortest.
 */
@@ -1535,6 +1543,7 @@ QmlListProperty<QmlAbstractAnimation> QmlAnimationGroup::animations()
 
 /*!
     \qmlclass SequentialAnimation QmlSequentialAnimation
+  \since 4.7
     \inherits Animation
     \brief The SequentialAnimation element allows you to run animations sequentially.
 
@@ -1595,6 +1604,7 @@ void QmlSequentialAnimation::transition(QmlStateActions &actions,
 
 /*!
     \qmlclass ParallelAnimation QmlParallelAnimation
+  \since 4.7
     \inherits Animation
     \brief The ParallelAnimation element allows you to run animations in parallel.
 
@@ -1703,6 +1713,7 @@ void QmlPropertyAnimationPrivate::convertVariant(QVariant &variant, int type)
 
 /*!
     \qmlclass PropertyAnimation QmlPropertyAnimation
+  \since 4.7
     \inherits Animation
     \brief The PropertyAnimation element allows you to animate property changes.
 
diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp
index 3924bff..777fa08 100644
--- a/src/declarative/util/qmlbind.cpp
+++ b/src/declarative/util/qmlbind.cpp
@@ -71,6 +71,7 @@ public:
 
 /*!
     \qmlclass Binding QmlBind
+  \since 4.7
     \brief The Binding element allows arbitrary property bindings to be created.
 
     Sometimes it is necessary to bind to a property of an object that wasn't
diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp
index 90290b9..b24825b 100644
--- a/src/declarative/util/qmlconnection.cpp
+++ b/src/declarative/util/qmlconnection.cpp
@@ -66,6 +66,7 @@ public:
 
 /*!
     \qmlclass Connection QmlConnection
+  \since 4.7
     \brief A Connection object describes generalized connections to signals.
 
     When connecting to signals in QML, the usual way is to create an
diff --git a/src/declarative/util/qmldatetimeformatter.cpp b/src/declarative/util/qmldatetimeformatter.cpp
index 112da1e..0188856 100644
--- a/src/declarative/util/qmldatetimeformatter.cpp
+++ b/src/declarative/util/qmldatetimeformatter.cpp
@@ -74,6 +74,7 @@ public:
 
 /*!
     \qmlclass DateTimeFormatter QmlDateTimeFormatter
+  \since 4.7
     \brief The DateTimeFormatter allows you to control the format of a date string.
 
     \code
diff --git a/src/declarative/util/qmlnumberformatter.cpp b/src/declarative/util/qmlnumberformatter.cpp
index b301191..026a682 100644
--- a/src/declarative/util/qmlnumberformatter.cpp
+++ b/src/declarative/util/qmlnumberformatter.cpp
@@ -67,6 +67,7 @@ public:
 };
 /*!
     \qmlclass NumberFormatter
+  \since 4.7
     \brief The NumberFormatter allows you to control the format of a number string.
 
     The format property documentation has more details on how the format can be manipulated.
diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp
index e1eae10..8f83566 100644
--- a/src/declarative/util/qmlpropertychanges.cpp
+++ b/src/declarative/util/qmlpropertychanges.cpp
@@ -59,6 +59,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass PropertyChanges QmlPropertyChanges
+  \since 4.7
     \brief The PropertyChanges element describes new property values for a state.
 
     PropertyChanges provides a state change that modifies the properties of an item.
diff --git a/src/declarative/util/qmlpropertymap.cpp b/src/declarative/util/qmlpropertymap.cpp
index ccbec6f..317896e 100644
--- a/src/declarative/util/qmlpropertymap.cpp
+++ b/src/declarative/util/qmlpropertymap.cpp
@@ -90,6 +90,7 @@ void QmlPropertyMapMetaObject::propertyWrite(int index)
 
 /*!
     \class QmlPropertyMap
+  \since 4.7
     \brief The QmlPropertyMap class allows you to set key-value pairs that can be used in bindings.
 
     QmlPropertyMap provides a convenient way to expose domain data to the UI layer.
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index 4d85c89..3ac8713 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -130,6 +130,7 @@ QmlStateOperation::QmlStateOperation(QObjectPrivate &dd, QObject *parent)
 
 /*!
     \qmlclass State QmlState
+  \since 4.7
     \brief The State element defines configurations of objects and properties.
 
     A state is specified as a set of batched changes from the default configuration.
diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp
index 1a9ad05..9b22e23 100644
--- a/src/declarative/util/qmltransition.cpp
+++ b/src/declarative/util/qmltransition.cpp
@@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlclass Transition QmlTransition
+  \since 4.7
     \brief The Transition element defines animated transitions that occur on state changes.
 
     \sa {qmlstates}{States}, {state-transitions}{Transitions}
diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp
index 9e95b66..a45ea93 100644
--- a/src/declarative/util/qmlview.cpp
+++ b/src/declarative/util/qmlview.cpp
@@ -170,6 +170,7 @@ void QmlViewPrivate::execute()
 
 /*!
     \class QmlView
+  \since 4.7
     \brief The QmlView class provides a widget for displaying a Qt Declarative user interface.
 
     Any QGraphicsObject or QmlGraphicsItem
diff --git a/src/declarative/util/qmlxmllistmodel.cpp b/src/declarative/util/qmlxmllistmodel.cpp
index a068094..e302fdb 100644
--- a/src/declarative/util/qmlxmllistmodel.cpp
+++ b/src/declarative/util/qmlxmllistmodel.cpp
@@ -67,6 +67,7 @@ typedef QPair<int, int> QmlXmlListRange;
 
 /*!
     \qmlclass XmlRole QmlXmlListModelRole
+  \since 4.7
     \brief The XmlRole element allows you to specify a role for an XmlListModel.
 */
 
@@ -446,6 +447,7 @@ void QmlXmlListModelPrivate::clear_role(QmlListProperty<QmlXmlListModelRole> *li
 
 /*!
     \qmlclass XmlListModel QmlXmlListModel
+  \since 4.7
     \brief The XmlListModel element is used to specify a model using XPath expressions.
 
     XmlListModel is used to create a model from XML data that can be used as a data source