diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-07-01 01:58:25 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-07-01 01:58:25 (GMT) |
| commit | 59a3b7d39e75884027decdd8a029062f0fdde32a (patch) | |
| tree | 49a2b28249d43babf40d83c91b8364929778fb51 /src/declarative/util/qmlstateoperations.h | |
| parent | ee44073a48392972f704d36f8794171700dceba4 (diff) | |
| parent | 6863162d579310e66694832ce1c1468cd1b7b169 (diff) | |
| download | Qt-59a3b7d39e75884027decdd8a029062f0fdde32a.zip Qt-59a3b7d39e75884027decdd8a029062f0fdde32a.tar.gz Qt-59a3b7d39e75884027decdd8a029062f0fdde32a.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlstateoperations.h')
| -rw-r--r-- | src/declarative/util/qmlstateoperations.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/util/qmlstateoperations.h b/src/declarative/util/qmlstateoperations.h index c7a6d42..6e5de48 100644 --- a/src/declarative/util/qmlstateoperations.h +++ b/src/declarative/util/qmlstateoperations.h @@ -70,7 +70,6 @@ public: virtual ActionList actions(); }; -QML_DECLARE_TYPE(QmlParentChange) class QmlRunScriptPrivate; class Q_DECLARATIVE_EXPORT QmlRunScript : public QmlStateOperation, public ActionEvent @@ -95,7 +94,6 @@ public: virtual void execute(); }; -QML_DECLARE_TYPE(QmlRunScript) class QmlSetPropertyPrivate; class Q_DECLARATIVE_EXPORT QmlSetProperty : public QmlStateOperation @@ -123,10 +121,13 @@ public: virtual ActionList actions(); }; -QML_DECLARE_TYPE(QmlSetProperty) QT_END_NAMESPACE +QML_DECLARE_TYPE(QmlParentChange) +QML_DECLARE_TYPE(QmlRunScript) +QML_DECLARE_TYPE(QmlSetProperty) + QT_END_HEADER #endif // QMLSTATEOPERATIONS_H |