AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Don't produce NSImages without a single representation

Browse Source 
Doing so results in exceptions inside AppKit when passed on to APIs that
expect valid images. It's better to produce nil-images.

Fixes: QTBUG-83494
Change-Id: I1e5bfa2a7fecd75a1ddb95bd1a6dc2e8db6b24f8
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-04-17 17:04:33 +02:00
parent a962bbec07
commit cd41b01f32
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/painting/qcoregraphics.mm
View File

@ -162,12 +162,12 @@ QT_END_NAMESPACE
if (icon.isNull()) if (icon.isNull())
return nil; return nil;
auto nsImage = [[NSImage alloc] initWithSize:NSZeroSize];
auto availableSizes = icon.availableSizes(); auto availableSizes = icon.availableSizes();
if (availableSizes.isEmpty() && size > 0) if (availableSizes.isEmpty() && size > 0)
availableSizes << QSize(size, size); availableSizes << QSize(size, size);
auto nsImage = [[[NSImage alloc] initWithSize:NSZeroSize] autorelease];
for (QSize size : qAsConst(availableSizes)) { for (QSize size : qAsConst(availableSizes)) {
QImage image = icon.pixmap(size).toImage(); QImage image = icon.pixmap(size).toImage();
if (image.isNull()) if (image.isNull())
@ -182,12 +182,15 @@ QT_END_NAMESPACE
[nsImage addRepresentation:[imageRep autorelease]]; [nsImage addRepresentation:[imageRep autorelease]];
} }
if (!nsImage.representations.count)
return nil;
[nsImage setTemplate:icon.isMask()]; [nsImage setTemplate:icon.isMask()];
if (size) if (size)
nsImage.size = CGSizeMake(size, size); nsImage.size = CGSizeMake(size, size);
return [nsImage autorelease]; return nsImage;
} }
@end @end