diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2012-03-09 11:47:42 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-14 08:01:05 +0100 |
| commit | eb04ab1081ae29962260514a85bbd88c091cb322 (patch) | |
| tree | f914bdc728a19dc69291a5e86020842f3ba18d64 /src | |
| parent | 34280c409d16b2e252bc90e89fc6937a81d0a6d2 (diff) | |
Remove use of redundante nullPixmap image reference
Change-Id: I40b82c25c813722a94d9897e1f2e1dd8a1681762
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/util/qquickpixmapcache.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp index 6ebdf57c22..9185fba343 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) |