Merge branch '4.7' into qmldocs

Conflicts:
	src/declarative/graphicsitems/qdeclarativetext.cpp
	src/declarative/graphicsitems/qdeclarativetextedit.cpp

7 files changed, 3 insertions, 107 deletions

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 4e9e8d5..267642d 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -84,11 +84,6 @@ QT_BEGIN_NAMESPACE
     element directly will result in an error.
 */
 
-/*!
-    \class QDeclarativeAbstractAnimation
-    \internal
-*/
-
 QDeclarativeAbstractAnimation::QDeclarativeAbstractAnimation(QObject *parent)
 : QObject(*(new QDeclarativeAbstractAnimationPrivate), parent)
 {
@@ -574,12 +569,6 @@ void QDeclarativeAbstractAnimation::timelineComplete()
 
     \sa {QML Animation}, {declarative/animation/basics}{Animation basics example}
 */
-/*!
-    \internal
-    \class QDeclarativePauseAnimation
-*/
-
-
 QDeclarativePauseAnimation::QDeclarativePauseAnimation(QObject *parent)
 : QDeclarativeAbstractAnimation(*(new QDeclarativePauseAnimationPrivate), parent)
 {
@@ -659,11 +648,6 @@ QAbstractAnimation *QDeclarativePauseAnimation::qtAnimation()
 
     \sa {QML Animation}, {declarative/animation/basics}{Animation basics example}
 */
-/*!
-    \internal
-    \class QDeclarativeColorAnimation
-*/
-
 QDeclarativeColorAnimation::QDeclarativeColorAnimation(QObject *parent)
 : QDeclarativePropertyAnimation(parent)
 {
@@ -776,10 +760,6 @@ void QDeclarativeColorAnimation::setTo(const QColor &t)
 
     \sa StateChangeScript
 */
-/*!
-    \internal
-    \class QDeclarativeScriptAction
-*/
 QDeclarativeScriptAction::QDeclarativeScriptAction(QObject *parent)
     :QDeclarativeAbstractAnimation(*(new QDeclarativeScriptActionPrivate), parent)
 {
@@ -933,10 +913,6 @@ QAbstractAnimation *QDeclarativeScriptAction::qtAnimation()
 
     \sa {QML Animation}, QtDeclarative
 */
-/*!
-    \internal
-    \class QDeclarativePropertyAction
-*/
 QDeclarativePropertyAction::QDeclarativePropertyAction(QObject *parent)
 : QDeclarativeAbstractAnimation(*(new QDeclarativePropertyActionPrivate), parent)
 {
@@ -1185,12 +1161,6 @@ void QDeclarativePropertyAction::transition(QDeclarativeStateActions &actions,
 
     \sa {QML Animation}, {declarative/animation/basics}{Animation basics example}
 */
-
-/*!
-    \internal
-    \class QDeclarativeNumberAnimation
-*/
-
 QDeclarativeNumberAnimation::QDeclarativeNumberAnimation(QObject *parent)
 : QDeclarativePropertyAnimation(parent)
 {
@@ -1276,7 +1246,7 @@ void QDeclarativeNumberAnimation::setTo(qreal t)
 
 /*!
     \qmlclass Vector3dAnimation QDeclarativeVector3dAnimation
-  \ingroup qml-animation-transition
+    \ingroup qml-animation-transition
     \since 4.7
     \inherits PropertyAnimation
     \brief The Vector3dAnimation element animates changes in QVector3d values.
@@ -1291,12 +1261,6 @@ void QDeclarativeNumberAnimation::setTo(qreal t)
 
     \sa {QML Animation}, {declarative/animation/basics}{Animation basics example}
 */
-
-/*!
-    \internal
-    \class QDeclarativeVector3dAnimation
-*/
-
 QDeclarativeVector3dAnimation::QDeclarativeVector3dAnimation(QObject *parent)
 : QDeclarativePropertyAnimation(parent)
 {
@@ -1396,12 +1360,6 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t)
 
     \sa {QML Animation}, {declarative/animation/basics}{Animation basics example}
 */
-
-/*!
-    \internal
-    \class QDeclarativeRotationAnimation
-*/
-
 QVariant _q_interpolateShortestRotation(qreal &f, qreal &t, qreal progress)
 {
     qreal newt = t;
@@ -1702,11 +1660,6 @@ void QDeclarativeSequentialAnimation::transition(QDeclarativeStateActions &actio
 
     \sa SequentialAnimation, {QML Animation}, {declarative/animation/basics}{Animation basics example}
 */
-/*!
-    \internal
-    \class QDeclarativeParallelAnimation
-*/
-
 QDeclarativeParallelAnimation::QDeclarativeParallelAnimation(QObject *parent) :
     QDeclarativeAnimationGroup(parent)
 {
@@ -2512,11 +2465,6 @@ void QDeclarativePropertyAnimation::transition(QDeclarativeStateActions &actions
 
     \sa {QML Animation}, {declarative/animation/basics}{Animation basics example}
 */
-
-/*!
-    \internal
-    \class QDeclarativeParentAnimation
-*/
 QDeclarativeParentAnimation::QDeclarativeParentAnimation(QObject *parent)
     : QDeclarativeAnimationGroup(*(new QDeclarativeParentAnimationPrivate), parent)
 {
diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp
index 86d08f5..88b45ae 100644
--- a/src/declarative/util/qdeclarativebind.cpp
+++ b/src/declarative/util/qdeclarativebind.cpp
@@ -72,7 +72,7 @@ public:
 
 /*!
     \qmlclass Binding QDeclarativeBind
-  \ingroup qml-working-with-data
+    \ingroup qml-working-with-data
     \since 4.7
     \brief The Binding element allows arbitrary property bindings to be created.
 
@@ -95,18 +95,7 @@ public:
     immediately pushed onto the new target.
 
     \sa QtDeclarative
-    */
-/*!
-    \internal
-    \class QDeclarativeBind
-    \brief The QDeclarativeBind class allows arbitrary property bindings to be created.
-
-    Simple bindings are usually earier to do in-place rather than creating a
-    QDeclarativeBind item. For that reason, QDeclarativeBind is usually used to transfer property information
-    from Qml to C++.
-
-    \sa cppqml
-    */
+*/
 QDeclarativeBind::QDeclarativeBind(QObject *parent)
     : QObject(*(new QDeclarativeBindPrivate), parent)
 {
diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp
index 293928e..15e5ac5 100644
--- a/src/declarative/util/qdeclarativeconnections.cpp
+++ b/src/declarative/util/qdeclarativeconnections.cpp
@@ -124,13 +124,6 @@ public:
 
     \sa QtDeclarative
 */
-
-/*!
-    \internal
-    \class QDeclarativeConnections
-    \brief The QDeclarativeConnections class describes generalized connections to signals.
-
-*/
 QDeclarativeConnections::QDeclarativeConnections(QObject *parent) :
     QObject(*(new QDeclarativeConnectionsPrivate), parent)
 {
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index c28ada3..e897458 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -127,12 +127,6 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \internal
-    \class QDeclarativePropertyChanges
-    \brief The QDeclarativePropertyChanges class describes new property values for a state.
-*/
-
-/*!
     \qmlproperty Object PropertyChanges::target
     This property holds the object which contains the properties to be changed.
 */
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index 6e17cf2..1ed7923 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -123,9 +123,6 @@ bool QDeclarativeActionEvent::override(QDeclarativeActionEvent *other)
     return false;
 }
 
-/*!
-    \internal
-*/
 QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObject *parent)
     : QObject(dd, parent)
 {
@@ -164,20 +161,6 @@ QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObje
     \sa {declarative/animation/states}{states example}, {qmlstates}{States},
     {qdeclarativeanimation.html#transitions}{QML Transitions}, QtDeclarative
 */
-
-/*!
-    \internal
-    \class QDeclarativeState
-    \brief The QDeclarativeState class allows you to define configurations of objects and properties.
-
-
-    QDeclarativeState allows you to specify a state as a set of batched changes from the default
-    configuration.
-
-    \sa {states-transitions}{States and Transitions}
-*/
-
-
 QDeclarativeState::QDeclarativeState(QObject *parent)
 : QObject(*(new QDeclarativeStatePrivate), parent)
 {
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp
index 21d7ded..478c7f4 100644
--- a/src/declarative/util/qdeclarativetransition.cpp
+++ b/src/declarative/util/qdeclarativetransition.cpp
@@ -99,12 +99,6 @@ QT_BEGIN_NAMESPACE
     \sa {QML Animation}, {declarative/animation/states}{states example}, {qmlstates}{States}, {QtDeclarative}
 */
 
-/*!
-    \internal
-    \class QDeclarativeTransition
-    \brief The QDeclarativeTransition class allows you to define animated transitions that occur on state changes.
-*/
-
 //ParallelAnimationWrapper allows us to do a "callback" when the animation finishes, rather than connecting
 //and disconnecting signals and slots frequently
 class ParallelAnimationWrapper : public QParallelAnimationGroup
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index 02bf370..47b502d 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -498,11 +498,6 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListProperty<QDecla
 }
 
 /*!
-    \class QDeclarativeXmlListModel
-    \internal
-*/
-
-/*!
     \qmlclass XmlListModel QDeclarativeXmlListModel
     \ingroup qml-working-with-data
   \since 4.7