summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2012-07-13 20:11:45 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-16 10:06:54 +0200
commit0b66f723f06f6d115ea37d4db8bb6c0b5f63885b (patch)
treecb25bae8edea50ff0ca25f281355e58de1851392 /src
parent034b5fd02e19a47fc542a9216d5de7642c0c5a27 (diff)
Add QStateMachine constructor that takes a ChildMode
Back when QStateMachine was changed to inherit QState, this constructor was conveniently left out because setting the state machine (root state) to be a parallel state group didn't actually work. But as of commit d281aa6936ad01e28dacabb41bd9eb59891f85a1, it does work, so add the missing constructor. Task-number: QTBUG-15430 Change-Id: I68c599baa0ef1bfc869195140cf5daf645e75b8b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/statemachine/qstatemachine.cpp14
-rw-r--r--src/corelib/statemachine/qstatemachine.h1
2 files changed, 15 insertions, 0 deletions
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 3ab108a92b..2d6ced3051 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -1918,6 +1918,20 @@ QStateMachine::QStateMachine(QObject *parent)
}
/*!
+ \since 5.0
+
+ Constructs a new state machine with the given \a childMode
+ and \a parent.
+*/
+QStateMachine::QStateMachine(QState::ChildMode childMode, QObject *parent)
+ : QState(*new QStateMachinePrivate, /*parentState=*/0)
+{
+ Q_D(QStateMachine);
+ d->childMode = childMode;
+ setParent(parent); // See comment in constructor above
+}
+
+/*!
\internal
*/
QStateMachine::QStateMachine(QStateMachinePrivate &dd, QObject *parent)
diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h
index bc3f2fa27f..964b89a66e 100644
--- a/src/corelib/statemachine/qstatemachine.h
+++ b/src/corelib/statemachine/qstatemachine.h
@@ -120,6 +120,7 @@ public:
};
explicit QStateMachine(QObject *parent = 0);
+ QStateMachine(QState::ChildMode childMode, QObject *parent = 0);
~QStateMachine();
void addState(QAbstractState *state);