summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativestate.cpp
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.cpp
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.cpp')
-rw-r--r--src/declarative/util/qdeclarativestate.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index dc2b2cc..eca90a4 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -187,6 +187,13 @@ void QDeclarativeState::setName(const QString &n)
{
Q_D(QDeclarativeState);
d->name = n;
+ d->named = true;
+}
+
+bool QDeclarativeState::isNamed() const
+{
+ Q_D(const QDeclarativeState);
+ return d->named;
}
bool QDeclarativeState::isWhenKnown() const