diff options
| author | Oleg Yadrov <oleg.yadrov@qt.io> | 2017-01-23 15:25:38 -0800 |
|---|---|---|
| committer | Oleg Yadrov <oleg.yadrov@qt.io> | 2017-01-23 23:34:44 +0000 |
| commit | 59780d132aa114f8b7edfb17a24b91d09e38236d (patch) | |
| tree | 1bd8b7e112043c4527bb9d3ad8f876087914df62 /src/gui/painting/qcoregraphics.mm | |
| parent | cbd7dea83ed5d1f8876759e44d589b0e4c90c5f3 (diff) | |
Cocoa: fix crash regression in qt_mac_create_nsimage()
The regression was introduced in d8857f21ac264. The original change was
meant to fix support for SVG icons, but failed to take into account
a valid QIcon with no sizes, but which is also unable to create
a pixmap for the requested size.
Task-number: QTBUG-58344
Change-Id: I7ac1dbfaf6e3dab8581fe4b33c814e2517fcdba8
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src/gui/painting/qcoregraphics.mm')
| -rw-r--r-- | src/gui/painting/qcoregraphics.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/painting/qcoregraphics.mm b/src/gui/painting/qcoregraphics.mm index 803328c10f..3753fa4e88 100644 --- a/src/gui/painting/qcoregraphics.mm +++ b/src/gui/painting/qcoregraphics.mm @@ -157,6 +157,8 @@ NSImage *qt_mac_create_nsimage(const QIcon &icon, int defaultSize) availableSizes << QSize(defaultSize, defaultSize); foreach (QSize size, availableSizes) { QPixmap pm = icon.pixmap(size); + if (pm.isNull()) + continue; QImage image = pm.toImage(); CGImageRef cgImage = qt_mac_toCGImage(image); NSBitmapImageRep *imageRep = [[NSBitmapImageRep alloc] initWithCGImage:cgImage]; |