From 1634d6b3c8aaf51e3a37f5a4a7bf2b72df38a5f6 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Tue, 29 May 2012 09:48:25 +1000
Subject: Remove unnecessary temporary variable

Change-Id: Icec38fb08d6dc31fb6d0d86ec280fbb4557d5b67
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
---
 src/quick/util/qquickstyledtext.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/quick/util/qquickstyledtext.cpp')

diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp
index 8462166dec..18f8e84c30 100644
--- a/src/quick/util/qquickstyledtext.cpp
+++ b/src/quick/util/qquickstyledtext.cpp
@@ -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;
                 }
             }
         }
-- 
cgit v1.2.3