summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2015-09-21 14:11:16 +0200
committerLars Knoll <lars.knoll@theqtcompany.com>2015-10-08 07:05:48 +0000
commitb1a8f75db8740a630e97994df0465251208a3470 (patch)
treed202b5bb26622ee1e4ba4570bd9d16fc06a2efd3
parent60b17b0231984fc9f8328b58a95a59294effed5e (diff)
Add \since 5.6 to method docs and document the changed signal
Change-Id: I9a727a2a01927693e8182eb5518ee4d8f6e5be23 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
-rw-r--r--src/corelib/statemachine/qhistorystate.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/corelib/statemachine/qhistorystate.cpp b/src/corelib/statemachine/qhistorystate.cpp
index a0ebb9d239..8887ce27e5 100644
--- a/src/corelib/statemachine/qhistorystate.cpp
+++ b/src/corelib/statemachine/qhistorystate.cpp
@@ -166,6 +166,8 @@ QHistoryState::~QHistoryState()
Returns this history state's default transition. The default transition is
taken when the history state has never been entered before. The target states
of the default transition therefore make up the default state.
+
+ \since 5.6
*/
QAbstractTransition *QHistoryState::defaultTransition() const
{
@@ -178,6 +180,8 @@ QAbstractTransition *QHistoryState::defaultTransition() const
This will set the source state of the \a transition to the history state.
Note that the eventTest method of the \a transition will never be called.
+
+ \since 5.6
*/
void QHistoryState::setDefaultTransition(QAbstractTransition *transition)
{
@@ -290,6 +294,15 @@ bool QHistoryState::event(QEvent *e)
\sa QHistoryState::historyType
*/
+/*!
+ \fn QHistoryState::defaultTransitionChanged()
+ \since 5.6
+
+ This signal is emitted when the defaultTransition property is changed.
+
+ \sa QHistoryState::defaultTransition
+*/
+
QT_END_NAMESPACE
#endif //QT_NO_STATEMACHINE