diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2012-04-10 18:11:30 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 13:15:01 +0200 |
| commit | 6f3bda0dce945a5fc75d8ebad302820fe9979d9b (patch) | |
| tree | 6581aad8a7fb21ccbebe09d23c30af0e3236e266 /src/quick/util/qquickpixmapcache.cpp | |
| parent | 44f9412bf789d73dd462292038686f5b07026132 (diff) | |
Initial bundle support
Change-Id: I095249f64ecf4ef1e3fbfb164e3d50edffab61e8
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/quick/util/qquickpixmapcache.cpp')
| -rw-r--r-- | src/quick/util/qquickpixmapcache.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp index 801b007cdd..0400c9580c 100644 --- a/src/quick/util/qquickpixmapcache.cpp +++ b/src/quick/util/qquickpixmapcache.cpp @@ -65,6 +65,7 @@ #include <QtCore/qdebug.h> #include <private/qobject_p.h> #include <QSslError> +#include <QQmlFile> #define IMAGEREQUEST_MAX_REQUEST_COUNT 8 #define IMAGEREQUEST_MAX_REDIRECT_RECURSION 16 @@ -556,7 +557,7 @@ void QQuickPixmapReader::processJob(QQuickPixmapReply *runningJob, const QUrl &u } } else { - QString lf = QQmlEnginePrivate::urlToLocalFileOrQrc(url); + QString lf = QQmlFile::urlToLocalFileOrQrc(url); if (!lf.isEmpty()) { // Image is local - load/decode immediately QImage image; @@ -975,7 +976,7 @@ static QQuickPixmapData* createPixmapDataSync(QQuickPixmap *declarativePixmap, Q QQuickPixmap::tr("Failed to get image from provider: %1").arg(url.toString())); } - QString localFile = QQmlEnginePrivate::urlToLocalFileOrQrc(url); + QString localFile = QQmlFile::urlToLocalFileOrQrc(url); if (localFile.isEmpty()) return 0; |