diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:25 +0100 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:26 +0100 |
| commit | 2bc362c9fa37455afbeb56e5f1852188ede3eab4 (patch) | |
| tree | b89e3c2c082a0285e8cd91733ddbc772fe4362a5 /src/corelib/statemachine/qabstractstate.cpp | |
| parent | 5de981d3bc3df874f9df35a6899345f4f61fa951 (diff) | |
| parent | 481db443d502c8ebc169b7256cb696428cf02199 (diff) | |
Merge dev into 5.13
Change-Id: I8113c6d8735a151bd152e6096f8c8b8e63a05474
Diffstat (limited to 'src/corelib/statemachine/qabstractstate.cpp')
| -rw-r--r-- | src/corelib/statemachine/qabstractstate.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/statemachine/qabstractstate.cpp b/src/corelib/statemachine/qabstractstate.cpp index 1a9ad4601d2..0db44bc4276 100644 --- a/src/corelib/statemachine/qabstractstate.cpp +++ b/src/corelib/statemachine/qabstractstate.cpp @@ -155,7 +155,8 @@ QAbstractState::~QAbstractState() } /*! - Returns this state's parent state, or 0 if the state has no parent state. + Returns this state's parent state, or \nullptr if the state has no + parent state. */ QState *QAbstractState::parentState() const { @@ -166,8 +167,8 @@ QState *QAbstractState::parentState() const } /*! - Returns the state machine that this state is part of, or 0 if the state is - not part of a state machine. + Returns the state machine that this state is part of, or \nullptr if + the state is not part of a state machine. */ QStateMachine *QAbstractState::machine() const { |