diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-07-18 15:35:44 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-07-30 15:02:24 +0000 |
| commit | 941184bd642c9627c85c5618c2168cefa7787b0e (patch) | |
| tree | d2806370b9515202ea9a651d37aa539edf62772b /src/plugins/platforms/cocoa/qcocoasystemsettings.mm | |
| parent | 9a51709ca6871a83afe58d26283eda63454b5214 (diff) | |
macOS: Forward declare 10.14 NSColors instead of disabling warning
Change-Id: I8fc1ba7aac1c8ac86a8cb5d6f864180e0721926f
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoasystemsettings.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoasystemsettings.mm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoasystemsettings.mm b/src/plugins/platforms/cocoa/qcocoasystemsettings.mm index 06c0f1adf0..a6cdf4211f 100644 --- a/src/plugins/platforms/cocoa/qcocoasystemsettings.mm +++ b/src/plugins/platforms/cocoa/qcocoasystemsettings.mm @@ -45,8 +45,15 @@ #include <QtGui/qfont.h> #include <QtGui/private/qcoregraphics_p.h> -QT_WARNING_PUSH -QT_WARNING_DISABLE_CLANG("-Wobjc-method-access") +#if !QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14) +@interface NSColor (MojaveForwardDeclarations) +@property (class, strong, readonly) NSColor *selectedContentBackgroundColor NS_AVAILABLE_MAC(10_14); +@property (class, strong, readonly) NSColor *unemphasizedSelectedTextBackgroundColor NS_AVAILABLE_MAC(10_14); +@property (class, strong, readonly) NSColor *unemphasizedSelectedTextColor NS_AVAILABLE_MAC(10_14); +@property (class, strong, readonly) NSColor *unemphasizedSelectedContentBackgroundColor NS_AVAILABLE_MAC(10_14); +@property (class, strong, readonly) NSArray<NSColor *> *alternatingContentBackgroundColors NS_AVAILABLE_MAC(10_14); +@end +#endif QT_BEGIN_NAMESPACE @@ -221,5 +228,3 @@ QHash<QPlatformTheme::Palette, QPalette*> qt_mac_createRolePalettes() } QT_END_NAMESPACE - -QT_WARNING_POP |