diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-02-18 18:19:20 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-02-18 18:19:20 (GMT) |
| commit | 914e6250148543b9bff013cb6dcf0195e838f469 (patch) | |
| tree | 7949fa292d77465facbce68f3b2fbecc0c890901 /src/corelib/statemachine/qhistorystate.cpp | |
| parent | e1b85d70420001f2be698d08e62b7e784a13a134 (diff) | |
| parent | cdefba000d1abc7c611c7f495e7a7409710038b5 (diff) | |
| download | Qt-914e6250148543b9bff013cb6dcf0195e838f469.zip Qt-914e6250148543b9bff013cb6dcf0195e838f469.tar.gz Qt-914e6250148543b9bff013cb6dcf0195e838f469.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/corelib/statemachine/qhistorystate.cpp')
| -rw-r--r-- | src/corelib/statemachine/qhistorystate.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/statemachine/qhistorystate.cpp b/src/corelib/statemachine/qhistorystate.cpp index 350c1a0..7093c32 100644 --- a/src/corelib/statemachine/qhistorystate.cpp +++ b/src/corelib/statemachine/qhistorystate.cpp @@ -168,6 +168,9 @@ QAbstractState *QHistoryState::defaultState() const /*! Sets this history state's default state to be the given \a state. \a state must be a sibling of this history state. + + Note that this function does not set \a state as the initial state + of its parent. */ void QHistoryState::setDefaultState(QAbstractState *state) { |