summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2011-08-26 10:56:46 +1000
committerQt by Nokia <qt-info@nokia.com>2011-08-29 02:42:29 +0200
commitb5e069a1832550bf620a5591102d43e33132a609 (patch)
tree469e6fe881996427e69ab6cb1cc940a467d26cac
parent33ecffd4e278955ddb36853580990d156e03fa09 (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>
-rw-r--r--src/declarative/items/qsganimatedimage.cpp3
-rw-r--r--src/declarative/items/qsgborderimage.cpp5
-rw-r--r--src/declarative/util/qdeclarativefontloader.cpp7
3 files changed, 4 insertions, 11 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);
diff --git a/src/declarative/items/qsgborderimage.cpp b/src/declarative/items/qsgborderimage.cpp
index 931a681c1a..bd62eaf1bb 100644
--- 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 7a1dec88f0..f7a7738172 100644
--- 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;