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 | |
| parent | 7c9c195235378c2619d140bccbb957ba1d7a7dea (diff) | |
| download | qtbase-7ccc333d77928877a43587792940883e8d37d4c3.tar.gz | |
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>
| -rw-r--r-- | src/corelib/kernel/qcore_mac_p.h | 3 | ||||
| -rw-r--r-- | src/gui/painting/qcoregraphics_p.h | 5 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoascreen.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index 0000f3b656..7633b7420c 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -113,6 +113,9 @@ kern_return_t IOObjectRelease(io_object_t object); Q_FORWARD_DECLARE_OBJC_CLASS(NSObject); Q_FORWARD_DECLARE_OBJC_CLASS(NSString); +// @compatibility_alias doesn't work with categories or their methods +#define QtExtras QT_MANGLE_NAMESPACE(QtExtras) + QT_BEGIN_NAMESPACE template <typename T, typename U, auto RetainFunction, auto ReleaseFunction> class QAppleRefCounted 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; diff --git a/src/plugins/platforms/cocoa/qcocoascreen.h b/src/plugins/platforms/cocoa/qcocoascreen.h index 57b1212440..e1596f65eb 100644 --- a/src/plugins/platforms/cocoa/qcocoascreen.h +++ b/src/plugins/platforms/cocoa/qcocoascreen.h @@ -143,6 +143,10 @@ QDebug operator<<(QDebug debug, const QCocoaScreen *screen); QT_END_NAMESPACE #if defined(__OBJC__) + +// @compatibility_alias doesn't work with categories or their methods +#define qt_displayId QT_MANGLE_NAMESPACE(qt_displayId) + @interface NSScreen (QtExtras) @property(readonly) CGDirectDisplayID qt_displayId; @end |