71 lines
3.6 KiB
Diff
71 lines
3.6 KiB
Diff
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
|
|
index c3dd49ff3e..6871399817 100644
|
|
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
|
|
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
|
|
@@ -283,7 +283,7 @@ void QScanThread::getUserConfigurations()
|
|
QMacAutoReleasePool pool;
|
|
userProfiles.clear();
|
|
|
|
- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
|
|
+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
|
|
for (NSString *ifName in wifiInterfaces) {
|
|
|
|
CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName];
|
|
@@ -598,7 +598,7 @@ void QCoreWlanEngine::doRequestUpdate()
|
|
|
|
QMacAutoReleasePool pool;
|
|
|
|
- NSArray<NSString *> *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/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcocoascreen.mm
|
|
index afe14e623c..74d69c2fa1 100644
|
|
--- a/src/plugins/platforms/cocoa/qcocoascreen.mm
|
|
+++ b/src/plugins/platforms/cocoa/qcocoascreen.mm
|
|
@@ -127,7 +127,7 @@ void QCocoaScreen::updateProperties()
|
|
const qreal previousRefreshRate = m_refreshRate;
|
|
|
|
// The reference screen for the geometry is always the primary screen
|
|
- QRectF primaryScreenGeometry = QRectF::fromCGRect([[NSScreen screens] firstObject].frame);
|
|
+ QRectF primaryScreenGeometry = QRectF::fromCGRect([[[NSScreen screens] firstObject] frame]);
|
|
m_geometry = qt_mac_flip(QRectF::fromCGRect(nsScreen.frame), primaryScreenGeometry).toRect();
|
|
m_availableGeometry = qt_mac_flip(QRectF::fromCGRect(nsScreen.visibleFrame), primaryScreenGeometry).toRect();
|
|
|
|
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
|
|
index df1ad82592..0318a4ff96 100644
|
|
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
|
|
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
|
|
@@ -1704,7 +1704,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window)
|
|
|
|
if (!m_drawContentBorderGradient) {
|
|
window.styleMask = window.styleMask & ~NSWindowStyleMaskTexturedBackground;
|
|
- [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 c17ad47aba..a0f1dd38fb 100644
|
|
--- a/src/plugins/platforms/cocoa/qnswindow.mm
|
|
+++ b/src/plugins/platforms/cocoa/qnswindow.mm
|
|
@@ -230,7 +230,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];
|
|
}
|
|
@@ -257,7 +257,7 @@ static bool isMouseEvent(NSEvent *ev)
|
|
+ (void)applicationActivationChanged:(NSNotification*)notification
|
|
{
|
|
const id sender = self;
|
|
- NSEnumerator<NSWindow*> *windowEnumerator = nullptr;
|
|
+ NSEnumerator *windowEnumerator = nullptr;
|
|
NSApplication *application = [NSApplication sharedApplication];
|
|
|
|
// Unfortunately there's no NSWindowListOrderedBackToFront,
|