From b5e069a1832550bf620a5591102d43e33132a609 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Fri, 26 Aug 2011 10:56:46 +1000
Subject: 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>
---
 src/declarative/items/qsganimatedimage.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/declarative/items/qsganimatedimage.cpp')

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);
-- 
cgit v1.2.3