Fix QDeclarativePixmap not setting its QPixmap.
authorYoann Lopes <yoann.lopes@nokia.com>
Wed, 1 Jun 2011 12:44:16 +0000 (14:44 +0200)
committerYoann Lopes <yoann.lopes@nokia.com>
Wed, 1 Jun 2011 12:44:16 +0000 (14:44 +0200)
When used with the scenegraph, it was only setting the texture but not
the pixmap.

src/declarative/util/qdeclarativepixmapcache.cpp

index f138741..5c51f71 100644 (file)
@@ -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;