1 files changed, 11 insertions, 5 deletions
diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h
index 33f0709..926d41f 100644
--- a/src/corelib/statemachine/qstate.h
+++ b/src/corelib/statemachine/qstate.h
@@ -55,21 +55,24 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Core)
 
 class QAbstractTransition;
-class QHistoryState;
 class QSignalTransition;
 
 class QStatePrivate;
 class Q_CORE_EXPORT QState : public QAbstractState
 {
     Q_OBJECT
+    Q_PROPERTY(QAbstractState* initialState READ initialState WRITE setInitialState)
+    Q_PROPERTY(QAbstractState* errorState READ errorState WRITE setErrorState)
+    Q_PROPERTY(ChildMode childMode READ childMode WRITE setChildMode)
+    Q_ENUMS(ChildMode)
 public:
-    enum Type {
-        Normal,
-        ParallelGroup
+    enum ChildMode {
+        ExclusiveStates,
+        ParallelStates
     };
 
     QState(QState *parent = 0);
-    QState(Type type, QState *parent = 0);
+    QState(ChildMode childMode, QState *parent = 0);
     ~QState();
 
     QAbstractState *errorState() const;
@@ -84,6 +87,9 @@ public:
     QAbstractState *initialState() const;
     void setInitialState(QAbstractState *state);
 
+    ChildMode childMode() const;
+    void setChildMode(ChildMode mode);
+
     void assignProperty(QObject *object, const char *name,
                         const QVariant &value);