summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraavit <eirik.aavitsland@digia.com>2014-03-04 15:01:42 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-17 14:45:18 +0100
commit2fde61964d8f7300476dbde2e8e17fb5a54dbf40 (patch)
treec7c80da6bac2e08e9ea1daac3ebd7f95281f4797
parentcd0843d4d73b783fe09f153ccd715f17c505f00a (diff)
downloadqtsvg-5.3.0-beta1.tar.gz
Fixes: runtime warnings when trying to render 0-size iconv5.3.0-beta1
Task-number: QTBUG-37035 Change-Id: I014988cdb57a2001685a8d50d79ee103322ed021 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
-rw-r--r--src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
index a8a2d15..1f47dfe 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);