diff options
author | David Boddie <dboddie@trolltech.com> | 2009-11-19 13:53:04 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2009-11-19 13:53:04 (GMT) |
commit | 4e53466f63bf05e90a69f80fda8580dabc1e9ed0 (patch) | |
tree | 0978f427af78291d8dd16004cc4ca33dbe1af433 /src/corelib/statemachine/qstatemachine.h | |
parent | 5bd71902f97ba75dc93ccf709dbfdd2ffeb361b2 (diff) | |
parent | fbbdf8698fb0444d5170b7d0a14e870ea789398f (diff) | |
download | Qt-4e53466f63bf05e90a69f80fda8580dabc1e9ed0.zip Qt-4e53466f63bf05e90a69f80fda8580dabc1e9ed0.tar.gz Qt-4e53466f63bf05e90a69f80fda8580dabc1e9ed0.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/corelib/statemachine/qstatemachine.h')
-rw-r--r-- | src/corelib/statemachine/qstatemachine.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index ff2b667..13c43e5 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -70,7 +70,7 @@ class Q_CORE_EXPORT QStateMachine : public QState Q_PROPERTY(bool animated READ isAnimated WRITE setAnimated) #endif public: - class SignalEvent : public QEvent + class Q_CORE_EXPORT SignalEvent : public QEvent { public: SignalEvent(QObject *sender, int signalIndex, @@ -89,7 +89,7 @@ public: friend class QSignalTransitionPrivate; }; - class WrappedEvent : public QEvent + class Q_CORE_EXPORT WrappedEvent : public QEvent { public: WrappedEvent(QObject *object, QEvent *event); |