diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-05-08 07:04:37 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-05-08 07:04:37 (GMT) |
| commit | 639004cbf1e9d3f94512d9a07e56aeafef4d93b9 (patch) | |
| tree | 175c52791fcc0d7bd2c1ef517b705b3d2850fc69 /src/corelib/statemachine/qsignaltransition.h | |
| parent | 9dcc7f9fea95d41f82fdde700f1a17da81257451 (diff) | |
| parent | 15de11bfcd2907e587dff41013fd39b62f0ca869 (diff) | |
| download | Qt-639004cbf1e9d3f94512d9a07e56aeafef4d93b9.zip Qt-639004cbf1e9d3f94512d9a07e56aeafef4d93b9.tar.gz Qt-639004cbf1e9d3f94512d9a07e56aeafef4d93b9.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/corelib/statemachine/qsignaltransition.h')
| -rw-r--r-- | src/corelib/statemachine/qsignaltransition.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h index c1a41ae..98a9ae7 100644 --- a/src/corelib/statemachine/qsignaltransition.h +++ b/src/corelib/statemachine/qsignaltransition.h @@ -43,9 +43,9 @@ #define QSIGNALTRANSITION_H #ifndef QT_STATEMACHINE_SOLUTION -#include <QtCore/qactiontransition.h> +#include <QtCore/qabstracttransition.h> #else -#include "qactiontransition.h" +#include "qabstracttransition.h" #endif QT_BEGIN_HEADER @@ -55,10 +55,10 @@ QT_BEGIN_NAMESPACE QT_MODULE(Core) class QSignalTransitionPrivate; -class Q_CORE_EXPORT QSignalTransition : public QActionTransition +class Q_CORE_EXPORT QSignalTransition : public QAbstractTransition { Q_OBJECT - Q_PROPERTY(QObject* object READ senderObject WRITE setSenderObject) + Q_PROPERTY(QObject* senderObject READ senderObject WRITE setSenderObject) Q_PROPERTY(QByteArray signal READ signal WRITE setSignal) public: QSignalTransition(QState *sourceState = 0); @@ -77,6 +77,7 @@ public: protected: bool eventTest(QEvent *event) const; + void onTransition(QEvent *event); bool event(QEvent *e); |