Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

Conflicts:
	src/corelib/animation/qanimationgroup.cpp
	src/corelib/animation/qvariantanimation.cpp
	src/gui/graphicsview/qgraphicsitem.cpp

10 files changed, 13 insertions, 14 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 3078792..e02b3eb 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -2840,7 +2840,7 @@ void QGraphicsItem::setMatrix(const QMatrix &matrix, bool combine)
     if (oldTransform == newTransform)
         return;
 
-    // Notify the item that the matrix is changing.
+    // Notify the item that the transformation matrix is changing.
     QVariant newTransformVariant(itemChange(ItemMatrixChange,
                                             qVariantFromValue<QMatrix>(newTransform.toAffine())));
     newTransform = QTransform(qVariantValue<QMatrix>(newTransformVariant));
diff --git a/src/gui/statemachine/qbasickeyeventtransition.cpp b/src/gui/statemachine/qbasickeyeventtransition.cpp
index 7821feb..7f515cd 100644
--- a/src/gui/statemachine/qbasickeyeventtransition.cpp
+++ b/src/gui/statemachine/qbasickeyeventtransition.cpp
@@ -25,6 +25,8 @@ QT_BEGIN_NAMESPACE
 /*!
   \internal
   \class QBasicKeyEventTransition
+  \since 4.6
+  \ingroup statemachine
 
   \brief The QBasicKeyEventTransition class provides a transition for Qt key events.
 */
@@ -156,7 +158,7 @@ void QBasicKeyEventTransition::setModifiersMask(Qt::KeyboardModifiers modifiersM
 /*!
   \reimp
 */
-bool QBasicKeyEventTransition::eventTest(QEvent *event) const
+bool QBasicKeyEventTransition::eventTest(QEvent *event)
 {
     Q_D(const QBasicKeyEventTransition);
     if (event->type() == d->eventType) {
diff --git a/src/gui/statemachine/qbasickeyeventtransition_p.h b/src/gui/statemachine/qbasickeyeventtransition_p.h
index 0d08da0..7506747 100644
--- a/src/gui/statemachine/qbasickeyeventtransition_p.h
+++ b/src/gui/statemachine/qbasickeyeventtransition_p.h
@@ -55,7 +55,7 @@ public:
     void setModifiersMask(Qt::KeyboardModifiers modifiers);
 
 protected:
-    bool eventTest(QEvent *event) const;
+    bool eventTest(QEvent *event);
     void onTransition(QEvent *);
 
 private:
diff --git a/src/gui/statemachine/qbasicmouseeventtransition.cpp b/src/gui/statemachine/qbasicmouseeventtransition.cpp
index 0cb727e..42b7580 100644
--- a/src/gui/statemachine/qbasicmouseeventtransition.cpp
+++ b/src/gui/statemachine/qbasicmouseeventtransition.cpp
@@ -25,6 +25,8 @@ QT_BEGIN_NAMESPACE
 /*!
   \internal
   \class QBasicMouseEventTransition
+  \since 4.6
+  \ingroup statemachine
 
   \brief The QBasicMouseEventTransition class provides a transition for Qt mouse events.
 */
@@ -159,7 +161,7 @@ void QBasicMouseEventTransition::setPath(const QPainterPath &path)
 /*!
   \reimp
 */
-bool QBasicMouseEventTransition::eventTest(QEvent *event) const
+bool QBasicMouseEventTransition::eventTest(QEvent *event)
 {
     Q_D(const QBasicMouseEventTransition);
     if (event->type() == d->eventType) {
diff --git a/src/gui/statemachine/qbasicmouseeventtransition_p.h b/src/gui/statemachine/qbasicmouseeventtransition_p.h
index 20c7f8f..57f83c6 100644
--- a/src/gui/statemachine/qbasicmouseeventtransition_p.h
+++ b/src/gui/statemachine/qbasicmouseeventtransition_p.h
@@ -58,7 +58,7 @@ public:
     void setPath(const QPainterPath &path);
 
 protected:
-    bool eventTest(QEvent *event) const;
+    bool eventTest(QEvent *event);
     void onTransition(QEvent *);
 
 private:
diff --git a/src/gui/statemachine/qguistatemachine.cpp b/src/gui/statemachine/qguistatemachine.cpp
index d30265a..b7563d7 100644
--- a/src/gui/statemachine/qguistatemachine.cpp
+++ b/src/gui/statemachine/qguistatemachine.cpp
@@ -9,13 +9,8 @@
 **
 ****************************************************************************/
 
-#ifdef QT_STATEMACHINE_SOLUTION
-#include "qstatemachine.h"
-#include "qstatemachine_p.h"
-#else
 #include <QtCore/qstatemachine.h>
 #include <private/qstatemachine_p.h>
-#endif
 #include <QtGui/qevent.h>
 #include <QtGui/qgraphicssceneevent.h>
 
diff --git a/src/gui/statemachine/qkeyeventtransition.cpp b/src/gui/statemachine/qkeyeventtransition.cpp
index e6ab11b..3cf51a3 100644
--- a/src/gui/statemachine/qkeyeventtransition.cpp
+++ b/src/gui/statemachine/qkeyeventtransition.cpp
@@ -140,7 +140,7 @@ void QKeyEventTransition::setModifiersMask(Qt::KeyboardModifiers modifiersMask)
 /*!
   \reimp
 */
-bool QKeyEventTransition::eventTest(QEvent *event) const
+bool QKeyEventTransition::eventTest(QEvent *event)
 {
     Q_D(const QKeyEventTransition);
     if (!QEventTransition::eventTest(event))
diff --git a/src/gui/statemachine/qkeyeventtransition.h b/src/gui/statemachine/qkeyeventtransition.h
index 3f797f1..08595e8 100644
--- a/src/gui/statemachine/qkeyeventtransition.h
+++ b/src/gui/statemachine/qkeyeventtransition.h
@@ -46,7 +46,7 @@ public:
 
 protected:
     void onTransition(QEvent *event);
-    bool eventTest(QEvent *event) const;
+    bool eventTest(QEvent *event);
 
 private:
     Q_DISABLE_COPY(QKeyEventTransition)
diff --git a/src/gui/statemachine/qmouseeventtransition.cpp b/src/gui/statemachine/qmouseeventtransition.cpp
index 3191a2f..5ffdab0 100644
--- a/src/gui/statemachine/qmouseeventtransition.cpp
+++ b/src/gui/statemachine/qmouseeventtransition.cpp
@@ -170,7 +170,7 @@ void QMouseEventTransition::setPath(const QPainterPath &path)
 /*!
   \reimp
 */
-bool QMouseEventTransition::eventTest(QEvent *event) const
+bool QMouseEventTransition::eventTest(QEvent *event)
 {
     Q_D(const QMouseEventTransition);
     if (!QEventTransition::eventTest(event))
diff --git a/src/gui/statemachine/qmouseeventtransition.h b/src/gui/statemachine/qmouseeventtransition.h
index eee971e..e878a58 100644
--- a/src/gui/statemachine/qmouseeventtransition.h
+++ b/src/gui/statemachine/qmouseeventtransition.h
@@ -52,7 +52,7 @@ public:
 
 protected:
     void onTransition(QEvent *event);
-    bool eventTest(QEvent *event) const;
+    bool eventTest(QEvent *event);
 
 private:
     Q_DISABLE_COPY(QMouseEventTransition)