whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Forward declare 10.14 NSColors instead of disabling warning 

Change-Id: I8fc1ba7aac1c8ac86a8cb5d6f864180e0721926f
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
bb10
Tor Arne Vestbø 2018-07-18 15:35:44 +02:00
parent 9a51709ca6
commit 941184bd64
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/platforms/cocoa/qcocoasystemsettings.mm
View File

@ -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