diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-13 08:04:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-13 08:04:58 +0200 |
| commit | 388fe97f2a54089544dff0ed3af6ca70bf604716 (patch) | |
| tree | 163b47974c625849726804337bd667c942dfbc77 /src/corelib/statemachine | |
| parent | a0c4b6f34546bdd22167a76a0540d37e9a37c0cf (diff) | |
| parent | 591116490cf313808e8ba05ddd066656a1d1a566 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I81dbf90fc936c9bf08197baefa071117bddb1c63
Diffstat (limited to 'src/corelib/statemachine')
| -rw-r--r-- | src/corelib/statemachine/qstate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp index ae13d4e4cf..62dd4f0284 100644 --- a/src/corelib/statemachine/qstate.cpp +++ b/src/corelib/statemachine/qstate.cpp @@ -285,7 +285,7 @@ QAbstractState *QState::errorState() const /*! Sets this state's error state to be the given \a state. If the error state - is not set, or if it is set to 0, the state will inherit its parent's error + is not set, or if it is set to \nullptr, the state will inherit its parent's error state recursively. If no error state is set for the state itself or any of its ancestors, an error will cause the machine to stop executing and an error will be printed to the console. |