From ac7dcaec90d7603cd4dd80cdb3dcbdc689f376c2 Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@nokia.com>
Date: Wed, 1 Jun 2011 14:44:16 +0200
Subject: [PATCH] Fix QDeclarativePixmap not setting its QPixmap.

When used with the scenegraph, it was only setting the texture but not
the pixmap.
---
 src/declarative/util/qdeclarativepixmapcache.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index f138741..5c51f71 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;
-- 
2.7.4