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/gui/painting/qcoregraphics_p.h | |
| 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/gui/painting/qcoregraphics_p.h')
| -rw-r--r-- | src/gui/painting/qcoregraphics_p.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/painting/qcoregraphics_p.h b/src/gui/painting/qcoregraphics_p.h index ba2cde8325..e1697b0f38 100644 --- a/src/gui/painting/qcoregraphics_p.h +++ b/src/gui/painting/qcoregraphics_p.h @@ -69,9 +69,15 @@ QT_BEGIN_NAMESPACE Q_GUI_EXPORT CGBitmapInfo qt_mac_bitmapInfoForImage(const QImage &image); #ifdef HAVE_APPKIT -Q_GUI_EXPORT NSImage *qt_mac_create_nsimage(const QPixmap &pm); Q_GUI_EXPORT NSImage *qt_mac_create_nsimage(const QIcon &icon, int defaultSize = 0); Q_GUI_EXPORT QPixmap qt_mac_toQPixmap(const NSImage *image, const QSizeF &size); + +QT_END_NAMESPACE +@interface NSImage (QtExtras) ++ (instancetype)imageFromQImage:(const QT_PREPEND_NAMESPACE(QImage) &)image; +@end +QT_BEGIN_NAMESPACE + #endif Q_GUI_EXPORT CGImageRef qt_mac_toCGImage(const QImage &qImage); Q_GUI_EXPORT CGImageRef qt_mac_toCGImageMask(const QImage &qImage); |