diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-30 05:24:51 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-30 05:24:51 (GMT) |
| commit | 46eec6d54bad7a686b3dd5cd6e4aa8577d38740d (patch) | |
| tree | e4c828d1d1456b3fafe74a339562263b3f2c156d /src/declarative/extra/qfxanimatedimageitem.cpp | |
| parent | d85d7addc5084ee7d5de31dec562437f9c31c35d (diff) | |
| parent | d788c0127b86d8245aa0a8e2472562f444d98ee9 (diff) | |
| download | Qt-46eec6d54bad7a686b3dd5cd6e4aa8577d38740d.zip Qt-46eec6d54bad7a686b3dd5cd6e4aa8577d38740d.tar.gz Qt-46eec6d54bad7a686b3dd5cd6e4aa8577d38740d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlcomponentjs.cpp
src/declarative/qml/qmlcomponentjs_p.h
src/declarative/qml/qmlcomponentjs_p_p.h
Diffstat (limited to 'src/declarative/extra/qfxanimatedimageitem.cpp')
| -rw-r--r-- | src/declarative/extra/qfxanimatedimageitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/extra/qfxanimatedimageitem.cpp b/src/declarative/extra/qfxanimatedimageitem.cpp index a0ebd66..2e6688e 100644 --- a/src/declarative/extra/qfxanimatedimageitem.cpp +++ b/src/declarative/extra/qfxanimatedimageitem.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlclass AnimatedImage + \qmlclass AnimatedImage QFxAnimatedImageItem \inherits Image This item provides for playing animations stored as images containing a series of frames, |