Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Ia2ce994c42adc010c453edaeea57f672556958f6

4 files changed, 14 insertions, 9 deletions

diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp
index 6515748bf5..eb50f52bd6 100644
--- a/src/plugins/imageformats/ico/qicohandler.cpp
+++ b/src/plugins/imageformats/ico/qicohandler.cpp
@@ -535,8 +535,6 @@ QImage ICOReader::iconAt(int index)
                                     if (!mask.isNull()) {
                                         img = image;
                                         img.setAlphaChannel(mask);
-                                        // (Luckily, it seems that setAlphaChannel() does not ruin the alpha values
-                                        // of partially transparent pixels in those icons that have that)
                                     }
                                 }
                             }
diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
index 8a815a7665..2e15d11564 100644
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
@@ -617,8 +617,10 @@ QImage QCALayerBackingStore::toImage() const
 void QCALayerBackingStore::backingPropertiesChanged()
 {
     qCDebug(lcQpaBackingStore) << "Updating color space of existing buffers";
-    for (auto &buffer : m_buffers)
-        buffer->setColorSpace(colorSpace());
+    for (auto &buffer : m_buffers) {
+        if (buffer)
+            buffer->setColorSpace(colorSpace());
+    }
 }
 
 QPlatformGraphicsBuffer *QCALayerBackingStore::graphicsBuffer() const
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 88a5c7dcf3..a77b97f538 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -406,8 +406,6 @@ QVariant QCocoaIntegration::styleHint(StyleHint hint) const
         return QCoreTextFontEngine::fontSmoothingGamma();
     case ShowShortcutsInContextMenus:
         return QVariant(false);
-    // case CursorFlashTime:
-    //     return 50000;
     default: break;
     }
 
diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
index 285e316d4a..fc187e0f51 100644
--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
@@ -89,9 +89,16 @@ QIOSurfaceGraphicsBuffer::~QIOSurfaceGraphicsBuffer()
 
 void QIOSurfaceGraphicsBuffer::setColorSpace(QCFType<CGColorSpaceRef> colorSpace)
 {
-    Q_ASSERT(colorSpace);
-    IOSurfaceSetValue(m_surface, CFSTR("IOSurfaceColorSpace"),
-        QCFType<CFPropertyListRef>(CGColorSpaceCopyPropertyList(colorSpace)));
+    static const auto kIOSurfaceColorSpace = CFSTR("IOSurfaceColorSpace");
+
+    qCDebug(lcQpaIOSurface) << "Tagging" << this << "with color space" << colorSpace;
+
+    if (colorSpace) {
+        IOSurfaceSetValue(m_surface, kIOSurfaceColorSpace,
+            QCFType<CFPropertyListRef>(CGColorSpaceCopyPropertyList(colorSpace)));
+    } else {
+        IOSurfaceRemoveValue(m_surface, kIOSurfaceColorSpace);
+    }
 }
 
 const uchar *QIOSurfaceGraphicsBuffer::data() const