1 files changed, 5 insertions, 3 deletions
diff --git a/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.cpp b/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.cpp
index 9eca71619..6dc99e193 100644
--- a/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.cpp
+++ b/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.cpp
@@ -33,7 +33,8 @@ ShmServerBuffer::ShmServerBuffer(ShmServerBufferIntegration *integration, const
     }
 
     QString key = "qt_shm_emulation_" + QString::number(qimage.cacheKey());
-    m_shm = new QSharedMemory(key);
+    // ### Use proper native keys the next time we can break protocol compatibility
+    QT_IGNORE_DEPRECATIONS(m_shm = new QSharedMemory(key);)
     qsizetype shm_size = qimage.sizeInBytes();
     bool ok = m_shm->create(shm_size) && m_shm->lock();
     if (ok) {
@@ -60,7 +61,8 @@ struct ::wl_resource *ShmServerBuffer::resourceForClient(struct ::wl_client *cli
         }
         struct ::wl_resource *shm_integration_resource = integrationResource->handle;
         Resource *resource = add(client, 1);
-        m_integration->send_server_buffer_created(shm_integration_resource, resource->handle, m_shm->key(), m_width, m_height, m_bpl, m_shm_format);
+        QT_IGNORE_DEPRECATIONS(const QString shmKey = m_shm->key();)
+        m_integration->send_server_buffer_created(shm_integration_resource, resource->handle, shmKey, m_width, m_height, m_bpl, m_shm_format);
         return resource->handle;
     }
     return bufferResource->handle;
@@ -68,7 +70,7 @@ struct ::wl_resource *ShmServerBuffer::resourceForClient(struct ::wl_client *cli
 
 bool ShmServerBuffer::bufferInUse()
 {
-    return resourceMap().count() > 0;
+    return resourceMap().size() > 0;
 }
 
 QOpenGLTexture *ShmServerBuffer::toOpenGlTexture()