Remove unnecessary temporary variable
authorYann Bodson <yann.bodson@nokia.com>
Mon, 28 May 2012 23:48:25 +0000 (09:48 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 29 May 2012 01:13:11 +0000 (03:13 +0200)
Change-Id: Icec38fb08d6dc31fb6d0d86ec280fbb4557d5b67
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
src/quick/util/qquickstyledtext.cpp

index 8462166..18f8e84 100644 (file)
@@ -681,10 +681,12 @@ void QQuickStyledTextPrivate::parseImageAttributes(const QChar *&ch, const QStri
             // to avoid a relayout later on.
             QUrl url = baseUrl.resolved(image->url);
             if (url.isLocalFile()) {
-                QQuickPixmap *pix = new QQuickPixmap(context->engine(), url, image->size);
-                if (pix && pix->isReady()) {
-                    image->size = pix->implicitSize();
-                    image->pix = pix;
+                image->pix = new QQuickPixmap(context->engine(), url, image->size);
+                if (image->pix && image->pix->isReady()) {
+                    image->size = image->pix->implicitSize();
+                } else {
+                    delete image->pix;
+                    image->pix = 0;
                 }
             }
         }