diff options
author | Jason Barron <jbarron@trolltech.com> | 2009-08-21 12:39:29 (GMT) |
---|---|---|
committer | Jason Barron <jbarron@trolltech.com> | 2009-08-21 12:39:29 (GMT) |
commit | e59ee48a8656d04339967ad99334bd0ddca0c956 (patch) | |
tree | 4fe72429115ae4a4171cd3f1f06d9a3a425973d0 /src/corelib/statemachine/qeventtransition.h | |
parent | 4aa6869877d4906fcfaac5388294748512cace25 (diff) | |
parent | 508b447075fb852e61ddf88c92c9099dad292747 (diff) | |
download | Qt-e59ee48a8656d04339967ad99334bd0ddca0c956.zip Qt-e59ee48a8656d04339967ad99334bd0ddca0c956.tar.gz Qt-e59ee48a8656d04339967ad99334bd0ddca0c956.tar.bz2 |
Merge commit 'qt/master'
Diffstat (limited to 'src/corelib/statemachine/qeventtransition.h')
-rw-r--r-- | src/corelib/statemachine/qeventtransition.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/statemachine/qeventtransition.h b/src/corelib/statemachine/qeventtransition.h index 6cf6a96..941bfa5 100644 --- a/src/corelib/statemachine/qeventtransition.h +++ b/src/corelib/statemachine/qeventtransition.h @@ -57,15 +57,15 @@ class QEventTransitionPrivate; class Q_CORE_EXPORT QEventTransition : public QAbstractTransition { Q_OBJECT - Q_PROPERTY(QObject* eventObject READ eventObject WRITE setEventObject) + Q_PROPERTY(QObject* eventSource READ eventSource WRITE setEventSource) Q_PROPERTY(QEvent::Type eventType READ eventType WRITE setEventType) public: QEventTransition(QState *sourceState = 0); QEventTransition(QObject *object, QEvent::Type type, QState *sourceState = 0); ~QEventTransition(); - QObject *eventObject() const; - void setEventObject(QObject *object); + QObject *eventSource() const; + void setEventSource(QObject *object); QEvent::Type eventType() const; void setEventType(QEvent::Type type); |