1 files changed, 30 insertions, 17 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 55b3805df3..ce3a1304b2 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -94,11 +94,11 @@ static QCocoaIntegration::Options parseOptions(const QStringList &paramList)
     return options;
 }
 
-QCocoaIntegration *QCocoaIntegration::mInstance = 0;
+QCocoaIntegration *QCocoaIntegration::mInstance = nullptr;
 
 QCocoaIntegration::QCocoaIntegration(const QStringList &paramList)
     : mOptions(parseOptions(paramList))
-    , mFontDb(0)
+    , mFontDb(nullptr)
 #ifndef QT_NO_ACCESSIBILITY
     , mAccessibility(new QCocoaAccessibility)
 #endif
@@ -110,7 +110,7 @@ QCocoaIntegration::QCocoaIntegration(const QStringList &paramList)
     , mServices(new QCocoaServices)
     , mKeyboardMapper(new QCocoaKeyMapper)
 {
-    if (mInstance != 0)
+    if (mInstance)
         qWarning("Creating multiple Cocoa platform integrations is not supported");
     mInstance = this;
 
@@ -186,7 +186,7 @@ QCocoaIntegration::QCocoaIntegration(const QStringList &paramList)
 
 QCocoaIntegration::~QCocoaIntegration()
 {
-    mInstance = 0;
+    mInstance = nullptr;
 
     qt_resetNSApplicationSendEvent();
 
@@ -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
@@ -254,7 +254,7 @@ void QCocoaIntegration::updateScreens()
             if (primary != kCGNullDirectDisplay && primary != dpy)
                 continue;
         }
-        QCocoaScreen* screen = NULL;
+        QCocoaScreen* screen = nullptr;
         foreach (QCocoaScreen* existingScr, mScreens)
             // NSScreen documentation says do not cache the array returned from [NSScreen screens].
             // However in practice, we can identify a screen by its pointer: if resolution changes,
@@ -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);
     }
 }
@@ -296,7 +296,7 @@ QCocoaScreen *QCocoaIntegration::screenForNSScreen(NSScreen *nsScreen)
 {
     NSUInteger index = [[NSScreen screens] indexOfObject:nsScreen];
     if (index == NSNotFound)
-        return 0;
+        return nullptr;
 
     if (index >= unsigned(mScreens.count()))
         updateScreens();
@@ -306,7 +306,7 @@ QCocoaScreen *QCocoaIntegration::screenForNSScreen(NSScreen *nsScreen)
             return screen;
     }
 
-    return 0;
+    return nullptr;
 }
 
 bool QCocoaIntegration::hasCapability(QPlatformIntegration::Capability cap) const
@@ -379,6 +379,19 @@ QAbstractEventDispatcher *QCocoaIntegration::createEventDispatcher() const
     return new QCocoaEventDispatcher;
 }
 
+#if QT_CONFIG(vulkan)
+QPlatformVulkanInstance *QCocoaIntegration::createPlatformVulkanInstance(QVulkanInstance *instance) const
+{
+    mCocoaVulkanInstance = new QCocoaVulkanInstance(instance);
+    return mCocoaVulkanInstance;
+}
+
+QCocoaVulkanInstance *QCocoaIntegration::getCocoaVulkanInstance() const
+{
+    return mCocoaVulkanInstance;
+}
+#endif
+
 QCoreTextFontDatabase *QCocoaIntegration::fontDatabase() const
 {
     return mFontDb.data();
@@ -480,14 +493,14 @@ void QCocoaIntegration::pushPopupWindow(QCocoaWindow *window)
 QCocoaWindow *QCocoaIntegration::popPopupWindow()
 {
     if (m_popupWindowStack.isEmpty())
-        return 0;
+        return nullptr;
     return m_popupWindowStack.takeLast();
 }
 
 QCocoaWindow *QCocoaIntegration::activePopupWindow() const
 {
     if (m_popupWindowStack.isEmpty())
-        return 0;
+        return nullptr;
     return m_popupWindowStack.front();
 }