summaryrefslogtreecommitdiffstats
path: root/src/corelib/statemachine/qstate.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-03-26 00:08:21 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-03-26 00:08:21 (GMT)
commit82c4fe87a9b2f65354803b9b6dc2054c4c63c8e8 (patch)
tree2d206134bb71260fa580160c7c75c351a4867e29 /src/corelib/statemachine/qstate.h
parent9f6b271e942d48cef566891bd9d9712e147df3a2 (diff)
parentf75961dfd20b82f2f5e2a4b7feaf59c841a93f6b (diff)
downloadQt-82c4fe87a9b2f65354803b9b6dc2054c4c63c8e8.zip
Qt-82c4fe87a9b2f65354803b9b6dc2054c4c63c8e8.tar.gz
Qt-82c4fe87a9b2f65354803b9b6dc2054c4c63c8e8.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/corelib/statemachine/qstate.h')
-rw-r--r--src/corelib/statemachine/qstate.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h
index 782a2a6..620104f 100644
--- a/src/corelib/statemachine/qstate.h
+++ b/src/corelib/statemachine/qstate.h
@@ -44,6 +44,8 @@
#include <QtCore/qabstractstate.h>
+#include <QtCore/qlist.h>
+
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -80,6 +82,7 @@ public:
QSignalTransition *addTransition(QObject *sender, const char *signal, QAbstractState *target);
QAbstractTransition *addTransition(QAbstractState *target);
void removeTransition(QAbstractTransition *transition);
+ QList<QAbstractTransition*> transitions() const;
QAbstractState *initialState() const;
void setInitialState(QAbstractState *state);