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

Conflicts:
	src/declarative/qml/qml.h

11 files changed, 24 insertions, 2 deletions

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