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

11 files changed, 24 insertions, 2 deletions

diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 2f24167..d60a20c 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -70,6 +70,7 @@ QML_DEFINE_NOCREATE_TYPE(QmlAbstractAnimation)
 
 /*!
     \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
@@ -516,6 +517,7 @@ void QmlAbstractAnimation::timelineComplete()
 
 /*!
     \qmlclass PauseAnimation QmlPauseAnimation
+  \since 4.7
     \inherits Animation
     \brief The PauseAnimation element provides a pause for an animation.
 
@@ -589,6 +591,7 @@ QAbstractAnimation *QmlPauseAnimation::qtAnimation()
 
 /*!
     \qmlclass ColorAnimation QmlColorAnimation
+  \since 4.7
     \inherits PropertyAnimation
     \brief The ColorAnimation element allows you to animate color changes.
 
@@ -652,6 +655,7 @@ QML_DEFINE_TYPE(Qt,4,6,ColorAnimation,QmlColorAnimation)
 
 /*!
     \qmlclass ScriptAction QmlScriptAction
+  \since 4.7
     \inherits Animation
     \brief The ScriptAction element allows scripts to be run during an animation.
 
@@ -757,6 +761,7 @@ QML_DEFINE_TYPE(Qt,4,6,ScriptAction,QmlScriptAction)
 
 /*!
     \qmlclass PropertyAction QmlPropertyAction
+  \since 4.7
     \inherits Animation
     \brief The PropertyAction element allows immediate property changes during animation.
 
@@ -1005,6 +1010,7 @@ QML_DEFINE_TYPE(Qt,4,6,PropertyAction,QmlPropertyAction)
 
 /*!
     \qmlclass ParentAction QmlParentAction
+  \since 4.7
     \inherits Animation
     \brief The ParentAction element allows parent changes during animation.
 
@@ -1208,6 +1214,7 @@ QML_DEFINE_TYPE(Qt,4,6,ParentAction,QmlParentAction)
 
 /*!
     \qmlclass NumberAnimation QmlNumberAnimation
+  \since 4.7
     \inherits PropertyAnimation
     \brief The NumberAnimation element allows you to animate changes in properties of type qreal.
 
@@ -1271,6 +1278,7 @@ QML_DEFINE_TYPE(Qt,4,6,NumberAnimation,QmlNumberAnimation)
 
 /*!
     \qmlclass Vector3dAnimation QmlVector3dAnimation
+  \since 4.7
     \inherits PropertyAnimation
     \brief The Vector3dAnimation element allows you to animate changes in properties of type QVector3d.
 */
@@ -1446,7 +1454,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.
@@ -1461,7 +1469,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.
 */
@@ -1537,6 +1545,7 @@ QmlListProperty<QmlAbstractAnimation> QmlAnimationGroup::animations()
 
 /*!
     \qmlclass SequentialAnimation QmlSequentialAnimation
+  \since 4.7
     \inherits Animation
     \brief The SequentialAnimation element allows you to run animations sequentially.
 
@@ -1597,6 +1606,7 @@ QML_DEFINE_TYPE(Qt,4,6,SequentialAnimation,QmlSequentialAnimation)
 
 /*!
     \qmlclass ParallelAnimation QmlParallelAnimation
+  \since 4.7
     \inherits Animation
     \brief The ParallelAnimation element allows you to run animations in parallel.
 
@@ -1705,6 +1715,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 fc1562b..6743edd 100644
--- a/src/declarative/util/qmlbind.cpp
+++ b/src/declarative/util/qmlbind.cpp
@@ -71,6 +71,7 @@ public:
 QML_DEFINE_TYPE(Qt,4,6,Binding,QmlBind)
 /*!
     \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 3d04aaf..204377c 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 c44ca5e..4b8fb00 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 f78abdf..0845d0c 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 3abbadd..7586b77 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 ea99bd5..cedaac2 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 e90fc20..e2ce417 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 6c9c03e..b94394f 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.
 */
 
@@ -486,6 +487,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