diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-28 12:29:19 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-28 12:29:19 (GMT) |
| commit | e473c6b6c61ce1f10ddd26dfc0aba6b072b6256d (patch) | |
| tree | 3efd4a3b585e4c2ddd0bcd93c2f5c0da14abdde1 /tests/auto/qstatemachine | |
| parent | d1f4f443dac3329a1068f9a857d41999d0bcf1d4 (diff) | |
| parent | dcc6bf72843689dbe02404fc642641a3ba58106a (diff) | |
| download | Qt-e473c6b6c61ce1f10ddd26dfc0aba6b072b6256d.zip Qt-e473c6b6c61ce1f10ddd26dfc0aba6b072b6256d.tar.gz Qt-e473c6b6c61ce1f10ddd26dfc0aba6b072b6256d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qstatemachine')
| -rw-r--r-- | tests/auto/qstatemachine/tst_qstatemachine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp index a3f2f54..1fae92b 100644 --- a/tests/auto/qstatemachine/tst_qstatemachine.cpp +++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp @@ -1754,7 +1754,7 @@ protected: bool eventTest(QEvent *e) { if (!QSignalTransition::eventTest(e)) return false; - QSignalEvent *se = static_cast<QSignalEvent*>(e); + QStateMachine::SignalEvent *se = static_cast<QStateMachine::SignalEvent*>(e); const_cast<TestSignalTransition*>(this)->m_args = se->arguments(); return true; } @@ -3954,7 +3954,7 @@ public: void onTransition(QEvent *e) { QSignalTransition::onTransition(e); - QSignalEvent *se = static_cast<QSignalEvent*>(e); + QStateMachine::SignalEvent *se = static_cast<QStateMachine::SignalEvent*>(e); eventSignalIndex = se->signalIndex(); } |