Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeui

Conflicts:
	src/gui/graphicsview/qgraphicsitem.cpp

1 files changed, 43 insertions, 4 deletions

diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h
index e3b09e0..c7de171 100644
--- a/src/corelib/statemachine/qstatemachine.h
+++ b/src/corelib/statemachine/qstatemachine.h
@@ -3,9 +3,39 @@
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information (qt-info@nokia.com)
 **
-** This file is part of the $MODULE$ of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
 **
-** $TROLLTECH_DUAL_LICENSE$
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
@@ -66,8 +96,8 @@ public:
     QString errorString() const;
     void clearError();
 
-    QActionState::RestorePolicy globalRestorePolicy() const;
-    void setGlobalRestorePolicy(QActionState::RestorePolicy restorePolicy);
+    QAbstractState::RestorePolicy globalRestorePolicy() const;
+    void setGlobalRestorePolicy(QAbstractState::RestorePolicy restorePolicy);
 
     void postEvent(QEvent *event, int delay = 0);
 
@@ -87,6 +117,10 @@ Q_SIGNALS:
     void stopped();
     void finished();
 
+#ifndef QT_NO_ANIMATION
+    void animationsFinished();
+#endif
+
 protected:
     void postInternalEvent(QEvent *event);
 
@@ -98,15 +132,20 @@ protected:
 
     bool event(QEvent *e);
 
+protected:
 #ifdef QT_STATEMACHINE_SOLUTION
      QStateMachinePrivate *d_ptr;
 #endif
+    QStateMachine(QStateMachinePrivate &dd, QObject *parent);
 
 private:
     Q_DISABLE_COPY(QStateMachine)
     Q_DECLARE_PRIVATE(QStateMachine)
     Q_PRIVATE_SLOT(d_func(), void _q_start())
     Q_PRIVATE_SLOT(d_func(), void _q_process())
+#ifndef QT_NO_ANIMATION
+    Q_PRIVATE_SLOT(d_func(), void _q_animationFinished())
+#endif
 };
 
 QT_END_NAMESPACE