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>

diff --git a/src/declarative/items/qsganimatedimage.cpp b/src/declarative/items/qsganimatedimage.cpp
index ea36153..e4bba51 100644 (file)
--- 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);

diff --git a/src/declarative/items/qsgborderimage.cpp b/src/declarative/items/qsgborderimage.cpp
index 931a681..bd62eaf 100644 (file)
--- a/src/declarative/items/qsgborderimage.cpp
+++ b/src/declarative/items/qsgborderimage.cpp
@@ -306,15 +306,12 @@ void QSGBorderImage::load()
     } else {
         d->status = Loading;
         if (d->url.path().endsWith(QLatin1String("sci"))) {
-#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
             QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(d->url);
             if (!lf.isEmpty()) {
                 QFile file(lf);
                 file.open(QIODevice::ReadOnly);
                 setGridScaledImage(QSGGridScaledImage(&file));
-            } else
-#endif
-            {
+            } else {
                 QNetworkRequest req(d->url);
                 d->sciReply = qmlEngine(this)->networkAccessManager()->get(req);
 

diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index 7a1dec8..f7a7738 100644 (file)
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -193,10 +193,9 @@ void QDeclarativeFontLoader::setSource(const QUrl &url)
     Q_D(QDeclarativeFontLoader);
     if (url == d->url)
         return;
-    d->url = qmlContext(this)->resolvedUrl(url);
+    d->url = url;
     emit sourceChanged();
 
-#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
     QString localFile = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(d->url);
     if (!localFile.isEmpty()) {
         if (!d->fonts.contains(d->url)) {
@@ -211,9 +210,7 @@ void QDeclarativeFontLoader::setSource(const QUrl &url)
         } else {
             updateFontInfo(QFontDatabase::applicationFontFamilies(d->fonts[d->url]->id).at(0), Ready);
         }
-    } else
-#endif
-    {
+    } else {
         if (!d->fonts.contains(d->url)) {
             QDeclarativeFontObject *fo = new QDeclarativeFontObject;
             d->fonts[d->url] = fo;