diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-03 06:48:56 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-03 06:48:56 (GMT) |
| commit | ee259b6c04cf4296f45eed31c4d3c5c195fc0924 (patch) | |
| tree | 67645a557da11167e225704740e7a8aa928b5ee7 /src/declarative/graphicsitems/qmlgraphicsitem.cpp | |
| parent | 79d35acae62bf28c37022b763b04e94f5e67bf6f (diff) | |
| parent | 7bc853890bbd8653c3d058d50811ae6dfaad1fd1 (diff) | |
| download | Qt-ee259b6c04cf4296f45eed31c4d3c5c195fc0924.zip Qt-ee259b6c04cf4296f45eed31c4d3c5c195fc0924.tar.gz Qt-ee259b6c04cf4296f45eed31c4d3c5c195fc0924.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicsitem.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp index 0e741c4..5083f43 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp @@ -2918,5 +2918,5 @@ QML_DECLARE_TYPE(QmlGraphicsKeysAttached) QML_DECLARE_TYPEINFO(QmlGraphicsKeysAttached, QML_HAS_ATTACHED_PROPERTIES) QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Keys,QmlGraphicsKeysAttached) QML_DECLARE_TYPE(QmlGraphicsKeyNavigationAttached) +QML_DECLARE_TYPEINFO(QmlGraphicsKeyNavigationAttached, QML_HAS_ATTACHED_PROPERTIES) QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,KeyNavigation,QmlGraphicsKeyNavigationAttached) - |