summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativestate_p_p.h
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-06-07 04:44:06 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-06-07 04:45:35 (GMT)
commit0619c12bfee40826034dbc31f9d398182a3aa49f (patch)
tree8a57c54a654b9fa48852ba2ec11cf1f275cd2814 /src/declarative/util/qdeclarativestate_p_p.h
parented5f6c87e783960f880d56f58149985366d34615 (diff)
downloadQt-0619c12bfee40826034dbc31f9d398182a3aa49f.zip
Qt-0619c12bfee40826034dbc31f9d398182a3aa49f.tar.gz
Qt-0619c12bfee40826034dbc31f9d398182a3aa49f.tar.bz2
Ensure state operations assigned to the default state are triggered
when returning to that state. Task-number: QTBUG-11228
Diffstat (limited to 'src/declarative/util/qdeclarativestate_p_p.h')
-rw-r--r--src/declarative/util/qdeclarativestate_p_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h
index 4a2af0f..2ef9bb0 100644
--- a/src/declarative/util/qdeclarativestate_p_p.h
+++ b/src/declarative/util/qdeclarativestate_p_p.h
@@ -101,12 +101,13 @@ class QDeclarativeStatePrivate : public QObjectPrivate
public:
QDeclarativeStatePrivate()
- : when(0), inState(false), group(0) {}
+ : when(0), named(false), inState(false), group(0) {}
typedef QList<QDeclarativeSimpleAction> SimpleActionList;
QString name;
QDeclarativeBinding *when;
+ bool named;
struct OperationGuard : public QDeclarativeGuard<QDeclarativeStateOperation>
{