diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm index 66baf16..89794ef 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm @@ -830,7 +830,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl QFixed QCoreTextFontEngine::emSquareSize() const { - return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); + return QFixed(int(CTFontGetUnitsPerEm(ctfont))); } QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm index 341d3bccf2..3368234c26 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm +++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm @@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations() QMacAutoReleasePool pool; userProfiles.clear(); - NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; for (NSString *ifName in wifiInterfaces) { CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName]; @@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate() QMacAutoReleasePool pool; - NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; for (NSString *ifName in wifiInterfaces) { scanThread->interfaceName = QString::fromNSString(ifName); scanThread->start(); diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index d1f19f2..1ac2cf1 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -1699,7 +1699,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window) if (!m_drawContentBorderGradient) { window.styleMask = window.styleMask & ~NSTexturedBackgroundWindowMask; - [window.contentView.superview setNeedsDisplay:YES]; + [[window.contentView superview] setNeedsDisplay:YES]; window.titlebarAppearsTransparent = NO; return; } diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm index e846fa0..4171cd4 100644 --- a/src/plugins/platforms/cocoa/qnswindow.mm +++ b/src/plugins/platforms/cocoa/qnswindow.mm @@ -224,7 +224,7 @@ static bool isMouseEvent(NSEvent *ev) if (pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) { NSPoint loc = [theEvent locationInWindow]; NSRect windowFrame = [self convertRectFromScreen:self.frame]; - NSRect contentFrame = self.contentView.frame; + NSRect contentFrame = [self.contentView frame]; if (NSMouseInRect(loc, windowFrame, NO) && !NSMouseInRect(loc, contentFrame, NO)) [qnsview_cast(pw->view()) handleFrameStrutMouseEvent:theEvent]; } @@ -253,7 +253,7 @@ static bool isMouseEvent(NSEvent *ev) + (void)applicationActivationChanged:(NSNotification*)notification { const id sender = self; - NSEnumerator *windowEnumerator = nullptr; + NSEnumerator *windowEnumerator = nullptr; NSApplication *application = [NSApplication sharedApplication]; #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)