From 2fde61964d8f7300476dbde2e8e17fb5a54dbf40 Mon Sep 17 00:00:00 2001
From: aavit <eirik.aavitsland@digia.com>
Date: Tue, 4 Mar 2014 15:01:42 +0100
Subject: [PATCH] Fixes: runtime warnings when trying to render 0-size icon
Task-number: QTBUG-37035
Change-Id: I014988cdb57a2001685a8d50d79ee103322ed021
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
---
src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
index a8a2d159..1f47dfef 100644
--- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
+++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
@@ -169,6 +169,9 @@ QPixmap QSvgIconEngine::pixmap(const QSize &size, QIcon::Mode mode,
if (!actualSize.isNull())
actualSize.scale(size, Qt::KeepAspectRatio);
+ if (actualSize.isEmpty())
+ return QPixmap();
+
QImage img(actualSize, QImage::Format_ARGB32_Premultiplied);
img.fill(0x00000000);
QPainter p(&img);
--
GitLab