From dd017ee946aaa7f968aa844a54b394f88109c150 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Tue, 27 Jan 2015 13:29:49 +0100 Subject: Doc fix: QHistoryState is registered in QML as HistoryState The documentation enum values should reflect that. Task-number: QTBUG-44088 Change-Id: I0042da252eac10301fff4289402f158a7b0d0ff6 Reviewed-by: Simon Hausmann --- src/imports/statemachine/state.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/imports') diff --git a/src/imports/statemachine/state.cpp b/src/imports/statemachine/state.cpp index 56ecd015f5..bcc14b5912 100644 --- a/src/imports/statemachine/state.cpp +++ b/src/imports/statemachine/state.cpp @@ -221,15 +221,15 @@ QQmlListProperty State::children() \brief The type of history that this history state records. - The default value of this property is QHistoryState.ShallowHistory. + The default value of this property is HistoryState.ShallowHistory. - This enum specifies the type of history that a QHistoryState records. + This enum specifies the type of history that a HistoryState records. \list - \li QHistoryState.ShallowHistory Only the immediate child states of the + \li HistoryState.ShallowHistory Only the immediate child states of the parent state are recorded. In this case, a transition with the history state as its target will end up in the immediate child state that the parent was in the last time it was exited. This is the default. - \li QHistoryState.DeepHistory Nested states are recorded. In this case + \li HistoryState.DeepHistory Nested states are recorded. In this case a transition with the history state as its target will end up in the most deeply nested descendant state the parent was in the last time it was exited. -- cgit v1.2.3