diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-10 17:16:54 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-09-10 17:16:54 +0000 |
| commit | d09d99af22536431a8b462eb6b5502e521249ed3 (patch) | |
| tree | 88530ae0b5bb57684c468f29711ed810d171ca7d /src/plugins/platforms | |
| parent | b13e3b0eb69a86558a62f2544a271434818c012d (diff) | |
| parent | 683e144efbd91163795dc582aedc210c7d78de4d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/staging/5.12
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 0f87109ada..612290c9bd 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -72,12 +72,6 @@ #include <IOKit/graphics/IOGraphicsLib.h> -#if !QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14) -@interface NSApplication (MojaveForwardDeclarations) -@property (strong) NSAppearance *appearance NS_AVAILABLE_MAC(10_14); -@end -#endif - static void initResources() { Q_INIT_RESOURCE(qcocoaresources); @@ -139,21 +133,6 @@ QCocoaIntegration::QCocoaIntegration(const QStringList ¶mList) NSApplication *cocoaApplication = [QNSApplication sharedApplication]; qt_redirectNSApplicationSendEvent(); - if (__builtin_available(macOS 10.14, *)) { - // Disable dark appearance, unless the Info.plist or environment requests that it should be enabled - bool plistEnablesDarkAppearance = [[[NSBundle mainBundle] objectForInfoDictionaryKey: - @"NSRequiresAquaSystemAppearance"] boolValue]; - - bool hasEnvironmentRequiresAquaAppearance; - int environmentRequiresAquaAppearance = qEnvironmentVariableIntValue( - "QT_MAC_REQUIRES_AQUA_SYSTEM_APPEARANCE", &hasEnvironmentRequiresAquaAppearance); - bool environmentEnablesDarkAppearance = hasEnvironmentRequiresAquaAppearance - && environmentRequiresAquaAppearance == 0; - - if (!(plistEnablesDarkAppearance || environmentEnablesDarkAppearance)) - NSApp.appearance = [NSAppearance appearanceNamed:NSAppearanceNameAqua]; - } - if (qEnvironmentVariableIsEmpty("QT_MAC_DISABLE_FOREGROUND_APPLICATION_TRANSFORM")) { // Applications launched from plain executables (without an app // bundle) are "background" applications that does not take keybaord |