Support multiple buffer integrations

Allow compositors to support more than one type of hardware client
buffer integration.

[ChangeLog][QtWaylandCompositor] QtWaylandCompositor now supports
multiple client buffer integrations. QT_WAYLAND_CLIENT_BUFFER_INTEGRATION
will now accept a semicolon-separated list.

Fixes: QTBUG-68846
Change-Id: Iff1fa0a45b01f6a45dd744c37a89bac7d5e70658
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

2 files changed, 12 insertions, 12 deletions

diff --git a/src/compositor/hardware_integration/qwlhwintegration.cpp b/src/compositor/hardware_integration/qwlhwintegration.cpp
index c317f2f28..06834bc50 100644
--- a/src/compositor/hardware_integration/qwlhwintegration.cpp
+++ b/src/compositor/hardware_integration/qwlhwintegration.cpp
@@ -41,21 +41,21 @@ HardwareIntegration::HardwareIntegration(QWaylandCompositor *compositor)
 {
 }
 
-void HardwareIntegration::setClientBufferIntegration(const QString &name)
+void HardwareIntegration::setClientBufferIntegrationName(const QString &name)
 {
-    m_client_buffer_integration = name;
+    m_client_buffer_integration_name = name;
 }
-void HardwareIntegration::setServerBufferIntegration(const QString &name)
+void HardwareIntegration::setServerBufferIntegrationName(const QString &name)
 {
-    m_server_buffer_integration = name;
+    m_server_buffer_integration_name = name;
 }
 
 void HardwareIntegration::hardware_integration_bind_resource(Resource *resource)
 {
-    if (m_client_buffer_integration.size())
-        send_client_backend(resource->handle, m_client_buffer_integration);
-    if (m_server_buffer_integration.size())
-        send_server_backend(resource->handle, m_server_buffer_integration);
+    if (!m_client_buffer_integration_name.isEmpty())
+        send_client_backend(resource->handle, m_client_buffer_integration_name);
+    if (!m_server_buffer_integration_name.isEmpty())
+        send_server_backend(resource->handle, m_server_buffer_integration_name);
 }
 
 }
diff --git a/src/compositor/hardware_integration/qwlhwintegration_p.h b/src/compositor/hardware_integration/qwlhwintegration_p.h
index c7813a077..f60f41874 100644
--- a/src/compositor/hardware_integration/qwlhwintegration_p.h
+++ b/src/compositor/hardware_integration/qwlhwintegration_p.h
@@ -58,15 +58,15 @@ class HardwareIntegration : public QWaylandCompositorExtensionTemplate<HardwareI
 public:
     HardwareIntegration(QWaylandCompositor *compositor);
 
-    void setClientBufferIntegration(const QString &name);
-    void setServerBufferIntegration(const QString &name);
+    void setClientBufferIntegrationName(const QString &name);
+    void setServerBufferIntegrationName(const QString &name);
 
 protected:
     void hardware_integration_bind_resource(Resource *resource) override;
 
 private:
-    QString m_client_buffer_integration;
-    QString m_server_buffer_integration;
+    QString m_client_buffer_integration_name;
+    QString m_server_buffer_integration_name;
 };
 
 }