aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativepixmapcache.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/util/qdeclarativepixmapcache.cpp')
-rw-r--r--src/declarative/util/qdeclarativepixmapcache.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index 194dc70e10..108d2579ac 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -855,8 +855,8 @@ bool QDeclarativePixmapReply::event(QEvent *event)
if (de->texture) {
data->texture = de->texture;
data->context = de->context;
- } else
- data->pixmap = QPixmap::fromImage(de->image);
+ }
+ data->pixmap = QPixmap::fromImage(de->image);
data->implicitSize = de->implicitSize;
} else {
data->errorString = de->errorString;
@@ -1119,6 +1119,7 @@ QSGTexture *QDeclarativePixmap::texture(QSGContext *context) const
return d->texture;
else if (d->pixmapStatus == Ready) {
d->texture = context->createTexture(d->pixmap.toImage());
+ d->context = context;
return d->texture;
}
}