summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/statemachine/qabstractstate.cpp2
-rw-r--r--src/corelib/statemachine/qstatemachine.cpp6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/statemachine/qabstractstate.cpp b/src/corelib/statemachine/qabstractstate.cpp
index 1795bd6..c85fd09 100644
--- a/src/corelib/statemachine/qabstractstate.cpp
+++ b/src/corelib/statemachine/qabstractstate.cpp
@@ -100,7 +100,7 @@ QT_BEGIN_NAMESPACE
set in the state and restore them later.
- \sa setRestorePolicy(), restorePolicy()
+ \sa setRestorePolicy(), restorePolicy(), QAbstractState::assignProperty()
*/
/*!
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 90932f6..f1fc8a0 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -124,7 +124,7 @@ QT_BEGIN_NAMESPACE
QStateMachine machine;
QState *s1 = new QState();
- s1->setPropertyOnEntry(&button, "text", "Click me");
+ s1->assignProperty(&button, "text", "Click me");
QFinalState *s2 = new QFinalState();
s1->addTransition(&button, SIGNAL(clicked()), s2);
@@ -1921,6 +1921,8 @@ QSignalEventGenerator::QSignalEventGenerator(
*/
/*!
+ \internal
+
Constructs a new QSignalEvent object with the given \a sender, \a
signalIndex and \a arguments.
*/
@@ -1984,6 +1986,8 @@ QSignalEvent::~QSignalEvent()
*/
/*!
+ \internal
+
Constructs a new QStateFinishedEvent object associated with the given \a state.
*/
QStateFinishedEvent::QStateFinishedEvent(QState *state)