diff options
author | Martin Smith <martin.smith@nokia.com> | 2010-06-15 12:55:18 (GMT) |
---|---|---|
committer | Martin Smith <martin.smith@nokia.com> | 2010-06-15 12:55:18 (GMT) |
commit | 2cb5d8f7425bce83b5e95925e15d7920be3d2e8d (patch) | |
tree | 8b44fe4a9c0fc286e0017a6f34e669d53cb0299e /src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp | |
parent | e9e93fe79d7451f05a714241f759c557a455de67 (diff) | |
parent | 11420641d9341af6615baa21453e08c092f7fb10 (diff) | |
download | Qt-2cb5d8f7425bce83b5e95925e15d7920be3d2e8d.zip Qt-2cb5d8f7425bce83b5e95925e15d7920be3d2e8d.tar.gz Qt-2cb5d8f7425bce83b5e95925e15d7920be3d2e8d.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp index 261cc5c..d8527d3 100644 --- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp @@ -63,9 +63,10 @@ QT_BEGIN_NAMESPACE \inherits Image \since 4.7 - This item provides for playing animations stored as images containing a series of frames, - such as GIF files. The full list of supported formats can be determined with - QMovie::supportedFormats(). + The AnimatedImage element provides for playing animations stored as images containing a series of frames, + such as GIF files. + + The full list of supported formats can be determined with QMovie::supportedFormats(). \table \row |