diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-09 18:05:14 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <torarnv@gmail.com> | 2020-03-12 11:49:06 +0100 |
| commit | 52e9c8b4be6718bda1a46859d6b1c13664c57c2a (patch) | |
| tree | bbf77c7a432b201a8e09ea0dbe0c9e8902d9551c /src/plugins/platforms/cocoa/qcocoawindow.mm | |
| parent | 28d3d82a0d2f0fe8e4784a17a167c2f9f2e2420e (diff) | |
macOS: Streamline QImage to NSImage conversion
The conversion uses NSBitmapImageRep and correctly sets the display
pixel ratio and size of the resulting image, reducing the need for
clients to deal with this.
The function returns an auto-released object, as is customary for
class-functions like these.
Change-Id: I5124d1d8145a7f5266921b22fda1987798771ec1
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindow.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 2fbaec2c56..6ba0cee310 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -899,8 +899,7 @@ void QCocoaWindow::setWindowIcon(const QIcon &icon) [iconButton setImage:[workspace iconForFile:m_view.window.representedFilename]]; } else { QPixmap pixmap = icon.pixmap(QSize(22, 22)); - NSImage *image = static_cast<NSImage *>(qt_mac_create_nsimage(pixmap)); - [iconButton setImage:[image autorelease]]; + iconButton.image = [NSImage imageFromQImage:pixmap.toImage()]; } } |