diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-06 20:18:01 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-06-06 20:18:01 +0000 |
| commit | 5624e82d068ebab254239121810fc097af7fcb40 (patch) | |
| tree | 27d4a45faaa7cf948a6700bc680c2684893f4e2e /src/quick/util | |
| parent | d7b45f7dc1d5f28ecdb022c5a4c7673bc55257c8 (diff) | |
| parent | c254cec22a2352a3fcab60244a6ab74f95d45ace (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickpixmapcache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp index 8df1a892e4..e026608150 100644 --- a/src/quick/util/qquickpixmapcache.cpp +++ b/src/quick/util/qquickpixmapcache.cpp @@ -497,7 +497,7 @@ void QQuickPixmapReader::networkRequestDone(QNetworkReply *reply) QByteArray all = reply->readAll(); QBuffer buff(&all); buff.open(QIODevice::ReadOnly); - if (!readImage(reply->url(), &buff, &image, &errorString, &readSize, job->requestSize, job->data->providerOptions)) + if (!readImage(reply->url(), &buff, &image, &errorString, &readSize, job->requestSize, job->providerOptions)) error = QQuickPixmapReply::Decoding; } // send completion event to the QQuickPixmapReply |