diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-09-21 10:06:18 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-09-21 10:06:18 +0200 |
| commit | a4d1be727573a7a87c523a2ef28074c77d16f165 (patch) | |
| tree | d4f8f218c41771ca17c7ab324390485af868fa8e /src/corelib/statemachine | |
| parent | cd2fd21578a80bc5ac121c0419ee00b1799d0a60 (diff) | |
| parent | 660ec910ef60513b511e2292255e53701dbb239b (diff) | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/corelib/kernel/qobject.h
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
src/declarative/util/qdeclarativelistmodel.cpp
Diffstat (limited to 'src/corelib/statemachine')
| -rw-r--r-- | src/corelib/statemachine/qstatemachine.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index a3c702a312..d704615b9c 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -2135,6 +2135,7 @@ void QStateMachine::endMicrostep(QEvent *event) /*! \reimp + This function will call start() to start the state machine. */ void QStateMachine::onEntry(QEvent *event) { @@ -2144,6 +2145,8 @@ void QStateMachine::onEntry(QEvent *event) /*! \reimp + This function will call stop() to stop the state machine and + subsequently emit the stopped() signal. */ void QStateMachine::onExit(QEvent *event) { |