diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-23 22:41:37 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-23 22:41:37 (GMT) |
| commit | 17876b8c5f19261ac0c69b8de493b1796436e8a8 (patch) | |
| tree | fdd451dab3c6fe0d59fb482a7fdbac706959bcac /src/declarative/util/qmlstate.cpp | |
| parent | e3c7d67be8ae3121dd84a89f9add452fcbb775ac (diff) | |
| parent | d40282bdf1c0524058f8871ca37dd11de95b6a4d (diff) | |
| download | Qt-17876b8c5f19261ac0c69b8de493b1796436e8a8.zip Qt-17876b8c5f19261ac0c69b8de493b1796436e8a8.tar.gz Qt-17876b8c5f19261ac0c69b8de493b1796436e8a8.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlstate.cpp')
| -rw-r--r-- | src/declarative/util/qmlstate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index 70b0137..c41c31a 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -144,7 +144,7 @@ QmlStateOperation::QmlStateOperation(QObjectPrivate &dd, QObject *parent) \sa {states-transitions}{States and Transitions} */ -QML_DEFINE_TYPE(QmlState,State) +QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,State,QmlState) QmlState::QmlState(QObject *parent) : QObject(*(new QmlStatePrivate), parent) { |