1 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 55b3805df3..a50b9251b7 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -196,7 +196,7 @@ QCocoaIntegration::~QCocoaIntegration()
         QCocoaApplicationDelegate *delegate = [QCocoaApplicationDelegate sharedDelegate];
         [delegate removeAppleEventHandlers];
         // reset the application delegate
-        [[NSApplication sharedApplication] setDelegate: 0];
+        [[NSApplication sharedApplication] setDelegate:nil];
     }
 
 #ifndef QT_NO_CLIPBOARD
@@ -225,15 +225,15 @@ QCocoaIntegration::Options QCocoaIntegration::options() const
     return mOptions;
 }
 
-Q_LOGGING_CATEGORY(lcCocoaScreen, "qt.qpa.cocoa.screens");
+Q_LOGGING_CATEGORY(lcQpaScreen, "qt.qpa.screen");
 
 /*!
     \brief Synchronizes the screen list, adds new screens, removes deleted ones
 */
 void QCocoaIntegration::updateScreens()
 {
-    NSArray *scrs = [NSScreen screens];
-    NSMutableArray *screens = [NSMutableArray arrayWithArray:scrs];
+    NSArray<NSScreen *> *scrs = [NSScreen screens];
+    NSMutableArray<NSScreen *> *screens = [NSMutableArray<NSScreen *> arrayWithArray:scrs];
     if ([screens count] == 0)
         if ([NSScreen mainScreen])
            [screens addObject:[NSScreen mainScreen]];
@@ -244,7 +244,7 @@ void QCocoaIntegration::updateScreens()
     uint screenCount = [screens count];
     for (uint i = 0; i < screenCount; i++) {
         NSScreen* scr = [screens objectAtIndex:i];
-        CGDirectDisplayID dpy = [[[scr deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
+        CGDirectDisplayID dpy = scr.qt_displayId;
         // If this screen is a mirror and is not the primary one of the mirror set, ignore it.
         // Exception: The NSScreen API has been observed to a return a screen list with one
         // mirrored, non-primary screen when Qt is running as a startup item. Always use the
@@ -266,11 +266,11 @@ void QCocoaIntegration::updateScreens()
         if (screen) {
             remainingScreens.remove(screen);
             screen->updateGeometry();
-            qCDebug(lcCocoaScreen) << "Updated properties of" << screen;
+            qCDebug(lcQpaScreen) << "Updated properties of" << screen;
         } else {
             screen = new QCocoaScreen(i);
             mScreens.append(screen);
-            qCDebug(lcCocoaScreen) << "Adding" << screen;
+            qCDebug(lcQpaScreen) << "Adding" << screen;
             screenAdded(screen);
         }
         siblings << screen;
@@ -287,7 +287,7 @@ void QCocoaIntegration::updateScreens()
         mScreens.removeOne(screen);
         // Prevent stale references to NSScreen during destroy
         screen->m_screenIndex = -1;
-        qCDebug(lcCocoaScreen) << "Removing" << screen;
+        qCDebug(lcQpaScreen) << "Removing" << screen;
         destroyScreen(screen);
     }
 }