diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-08-26 10:56:46 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-29 02:42:29 +0200 |
| commit | b5e069a1832550bf620a5591102d43e33132a609 (patch) | |
| tree | 469e6fe881996427e69ab6cb1cc940a467d26cac /src/declarative/items/qsganimatedimage.cpp | |
| parent | 33ecffd4e278955ddb36853580990d156e03fa09 (diff) | |
Remove unnecessary code.
QT_NO_LOCALFILE_OPTIMIZED_QML should never be defined, and we don't
need to manually resolve urls coming from QML.
Change-Id: I7cdeb2814385bcb9d6004ab43686f65d388620eb
Reviewed-on: http://codereview.qt.nokia.com/3684
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/items/qsganimatedimage.cpp')
| -rw-r--r-- | src/declarative/items/qsganimatedimage.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/items/qsganimatedimage.cpp b/src/declarative/items/qsganimatedimage.cpp index ea36153ef0..e4bba512af 100644 --- a/src/declarative/items/qsganimatedimage.cpp +++ b/src/declarative/items/qsganimatedimage.cpp @@ -264,7 +264,6 @@ void QSGAnimatedImage::load() if (d->progress != oldProgress) emit progressChanged(d->progress); } else { -#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(d->url); if (!lf.isEmpty()) { //### should be unified with movieRequestFinished @@ -298,7 +297,7 @@ void QSGAnimatedImage::load() emit progressChanged(d->progress); return; } -#endif + d->status = Loading; d->progress = 0; emit statusChanged(d->status); |