Remove use of redundante nullPixmap image reference
authorGunnar Sletta <gunnar.sletta@nokia.com>
Fri, 9 Mar 2012 10:47:42 +0000 (11:47 +0100)
committerQt by Nokia <qt-info@nokia.com>
Wed, 14 Mar 2012 07:01:05 +0000 (08:01 +0100)
Change-Id: I40b82c25c813722a94d9897e1f2e1dd8a1681762
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>

src/quick/util/qquickpixmapcache.cpp

index 6ebdf57..9185fba 100644 (file)
@@ -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)