diff options
author | Yoann Lopes <yoann.lopes@nokia.com> | 2011-06-01 14:44:16 +0200 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@nokia.com> | 2011-06-01 14:44:16 +0200 |
commit | ac7dcaec90d7603cd4dd80cdb3dcbdc689f376c2 (patch) | |
tree | 67bd7d048ca645d2d9aacef795b9faf69d1d9d4f /src/declarative/util | |
parent | b0f23457d736baf99a2f7460d1942da632cc6a15 (diff) |
Fix QDeclarativePixmap not setting its QPixmap.
When used with the scenegraph, it was only setting the texture but not
the pixmap.
Diffstat (limited to 'src/declarative/util')
-rw-r--r-- | src/declarative/util/qdeclarativepixmapcache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp index f1387418ef..5c51f7186c 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; |