1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cocoa: Adapt to Xcode 6 clang version sudden pickiness

Browse Source 
Yes, that means OS X Yosemite fix.

Change-Id: I236f7af7b803de24ff0895e04c9a9253b5cfdb3b
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
Gabriel de Dietrich 2014-06-03 14:20:20 +02:00 committed by The Qt Project
parent 9e02f9cf08
commit 70e4428b6f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
View File

@ -380,7 +380,7 @@
- (BOOL)accessibilityIsAttributeSettable:(NSString *)attribute { - (BOOL)accessibilityIsAttributeSettable:(NSString *)attribute {
QAccessibleInterface *iface = QAccessible::accessibleInterface(axid); QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
if (!iface) if (!iface)
return nil; return NO;
if ([attribute isEqualToString:NSAccessibilityFocusedAttribute]) { if ([attribute isEqualToString:NSAccessibilityFocusedAttribute]) {
return iface->state().focusable ? YES : NO; return iface->state().focusable ? YES : NO;

2
src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
View File

@ -124,7 +124,7 @@ static void cleanupCocoaApplicationDelegate()
[dockMenu release]; [dockMenu release];
[qtMenuLoader release]; [qtMenuLoader release];
if (reflectionDelegate) { if (reflectionDelegate) {
[NSApp setDelegate:reflectionDelegate]; [[NSApplication sharedApplication] setDelegate:reflectionDelegate];
[reflectionDelegate release]; [reflectionDelegate release];
} }
[[NSNotificationCenter defaultCenter] removeObserver:self]; [[NSNotificationCenter defaultCenter] removeObserver:self];

2
src/plugins/platforms/cocoa/qcocoamenuloader.mm
View File

@ -174,7 +174,7 @@ QT_END_NAMESPACE
- (void)removeActionsFromAppMenu - (void)removeActionsFromAppMenu
{ {
for (NSMenuItem *item in [appMenu itemArray]) for (NSMenuItem *item in [appMenu itemArray])
[item setTag:nil]; [item setTag:0];
} }
- (void)dealloc - (void)dealloc