diff options
author | Michael Spork <m.spork@steinberg.de> | 2022-05-02 15:38:35 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-05-03 01:38:46 +0200 |
commit | 7ccc333d77928877a43587792940883e8d37d4c3 (patch) | |
tree | 36329ee856c0df48c644e269524100769c7bd90d /src/gui | |
parent | 7c9c195235378c2619d140bccbb957ba1d7a7dea (diff) |
Namespace a few missing Objective-C categories and their methods
Fixes: QTBUG-100059
Pick-to: 6.2 6.3
Change-Id: I7579c9ee027de6a133a8b5d95d8e56829e089dab
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/painting/qcoregraphics_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/painting/qcoregraphics_p.h b/src/gui/painting/qcoregraphics_p.h index db012d3cda..04494cd514 100644 --- a/src/gui/painting/qcoregraphics_p.h +++ b/src/gui/painting/qcoregraphics_p.h @@ -72,6 +72,11 @@ Q_GUI_EXPORT CGBitmapInfo qt_mac_bitmapInfoForImage(const QImage &image); Q_GUI_EXPORT QPixmap qt_mac_toQPixmap(const NSImage *image, const QSizeF &size); QT_END_NAMESPACE + +// @compatibility_alias doesn't work with categories or their methods +#define imageFromQImage QT_MANGLE_NAMESPACE(imageFromQImage) +#define imageFromQIcon QT_MANGLE_NAMESPACE(imageFromQIcon) + @interface NSImage (QtExtras) + (instancetype)imageFromQImage:(const QT_PREPEND_NAMESPACE(QImage) &)image; + (instancetype)imageFromQIcon:(const QT_PREPEND_NAMESPACE(QIcon) &)icon; |