From: Gunnar Sletta <gunnar.sletta@nokia.com>
Date: Fri, 9 Mar 2012 10:47:42 +0000 (+0100)
Subject: Remove use of redundante nullPixmap image reference
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=eb04ab1081ae29962260514a85bbd88c091cb322;p=konrad%2Fqtdeclarative.git

Remove use of redundante nullPixmap image reference

Change-Id: I40b82c25c813722a94d9897e1f2e1dd8a1681762
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
---

diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp
index 6ebdf57..9185fba 100644
--- a/src/quick/util/qquickpixmapcache.cpp
+++ b/src/quick/util/qquickpixmapcache.cpp
@@ -984,7 +984,6 @@ static QQuickPixmapData* createPixmapDataSync(QQuickPixmap *declarativePixmap, Q
 
 struct QQuickPixmapNull {
     QUrl url;
-    QImage image;
     QSize size;
 };
 Q_GLOBAL_STATIC(QQuickPixmapNull, nullPixmap);
@@ -1087,8 +1086,7 @@ QImage QQuickPixmap::image() const
 {
     if (d && d->textureFactory)
         return d->textureFactory->image();
-    else
-        return nullPixmap()->image;
+    return QImage();
 }
 
 void QQuickPixmap::setImage(const QImage &p)