diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-11-11 07:46:20 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-11-11 07:46:20 (GMT) |
| commit | 8e5166aba8c8d79e47d4c4fccd5acf52f9cffec6 (patch) | |
| tree | f9b91b73e52ec389107cc8791ac76e87f962944b /src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp | |
| parent | 6ac7ce79b6041a7c35d08cb28f775dead9701c4b (diff) | |
| parent | 0faef2ba318b7df095d5c20fdddd0933ae4912c3 (diff) | |
| download | Qt-8e5166aba8c8d79e47d4c4fccd5acf52f9cffec6.zip Qt-8e5166aba8c8d79e47d4c4fccd5acf52f9cffec6.tar.gz Qt-8e5166aba8c8d79e47d4c4fccd5acf52f9cffec6.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/util/util.pri
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp index db28134..8c91056 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE QMovie::supportedFormats(). \table - \row + \row \o \image animatedimageitem.gif \o \qml |