Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove use of redundante nullPixmap image reference
Change-Id: I40b82c25c813722a94d9897e1f2e1dd8a1681762
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
  • Loading branch information
Gunnar Sletta authored and Qt by Nokia committed Mar 14, 2012
1 parent 34280c4 commit eb04ab1
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/quick/util/qquickpixmapcache.cpp
Expand Up @@ -984,7 +984,6 @@ static QQuickPixmapData* createPixmapDataSync(QQuickPixmap *declarativePixmap, Q

struct QQuickPixmapNull {
QUrl url;
QImage image;
QSize size;
};
Q_GLOBAL_STATIC(QQuickPixmapNull, nullPixmap);
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit eb04ab1

Please sign in to comment.