diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:08:19 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:08:19 +0100 |
| commit | 91055d9ba457b611208fbe31b87da5e1cd84c748 (patch) | |
| tree | a5dc7805ec9275ac732be0337297bc89dabf3a00 | |
| parent | 7ceb56b4153650cd920faee204ef7f1bb5a4d390 (diff) | |
| parent | 2fde61964d8f7300476dbde2e8e17fb5a54dbf40 (diff) | |
| download | qtsvg-91055d9ba457b611208fbe31b87da5e1cd84c748.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I5448195955ebadcbac6de7cc34ab8e40bd45ef56
| -rw-r--r-- | src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp | 3 |
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); |