aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquickstyledtext.cpp
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2012-05-29 09:48:25 +1000
committerQt by Nokia <qt-info@nokia.com>2012-05-29 03:13:11 +0200
commit1634d6b3c8aaf51e3a37f5a4a7bf2b72df38a5f6 (patch)
tree458677162c4a4c892117cc83196cfe224792d6a0 /src/quick/util/qquickstyledtext.cpp
parentd37d5be8d224aaa478b648bf5cefa04277edf781 (diff)
Remove unnecessary temporary variable
Change-Id: Icec38fb08d6dc31fb6d0d86ec280fbb4557d5b67 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/util/qquickstyledtext.cpp')
-rw-r--r--src/quick/util/qquickstyledtext.cpp10
1 files changed, 6 insertions, 4 deletions
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;
}
}
}