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

Conflicts:
	src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h
	src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h
	src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.h
	src/compositor/hardware_integration/qwaylandserverbufferintegrationplugin.h
	src/plugins/hardwareintegration/client/brcm-egl/main.cpp
	src/plugins/hardwareintegration/client/drm-egl-server/main.cpp
	src/plugins/hardwareintegration/client/wayland-egl/main.cpp
	src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp
	src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp
	src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
	src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp
	src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
	src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
	src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp

Change-Id: I9a9b418075970dd334babc3590b9b0315c2afb0d

4 files changed, 15 insertions, 14 deletions

diff --git a/src/plugins/hardwareintegration/client/brcm-egl/main.cpp b/src/plugins/hardwareintegration/client/brcm-egl/main.cpp
index 2c33eb498..f77b41ef0 100644
--- a/src/plugins/hardwareintegration/client/brcm-egl/main.cpp
+++ b/src/plugins/hardwareintegration/client/brcm-egl/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtWaylandClient/qwaylandclientbufferintegrationplugin.h>
-#include "qwaylandbrcmeglclientbufferintegration.h"
+#include <QtWaylandClient/private/qwaylandclientbufferintegrationplugin_p.h>
+#include "qwaylandbrcmeglintegration.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -56,15 +56,15 @@ public:
 QStringList QWaylandBrcmEglClientBufferPlugin::keys() const
 {
     QStringList list;
-    list << "brcm";
+    list << "wayland-brcm";
     return list;
 }
 
-QWaylandEglClientBufferIntegration *QWaylandBrcmEglClientBufferPlugin::create(const QString& system, const QStringList& paramList)
+QWaylandClientBufferIntegration *QWaylandBrcmEglClientBufferPlugin::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
-    if (system.toLower() == "brcm")
-        return new QWaylandBrcmEglClientBufferIntegration();
+    if (system.toLower() == "wayland-brcm")
+        return new QWaylandBrcmEglIntegration();
 
     return 0;
 }
diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp b/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp
index d6225a888..f53caf03a 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp
+++ b/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtWaylandClient/qwaylandclientbufferintegrationplugin.h>
-#include "qwaylandxcompositeglxclientbufferintegration.h"
+#include <QtWaylandClient/private/qwaylandclientbufferintegrationplugin_p.h>
+#include "qwaylandxcompositeglxintegration.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -64,7 +64,7 @@ QWaylandClientBufferIntegration *QWaylandXCompositeGlxClientBufferIntegrationPlu
 {
     Q_UNUSED(paramList);
     if (system.toLower() == "xcomposite-glx")
-        return new QWaylandXCompositeGLXClientBufferIntegration();
+        return new QWaylandXCompositeGLXIntegration();
 
     return 0;
 }
diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro
index 56dc27402..dd3886c47 100644
--- a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro
+++ b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro
@@ -10,4 +10,4 @@ LIBS += -lEGL
 SOURCES += \
     main.cpp
 
-include($PWD/../../../../hardwareintegration/compositor/brcm-egl/brcm-egl.pri)
+include(../../../../hardwareintegration/compositor/brcm-egl/brcm-egl.pri)
diff --git a/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h b/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h
index 7dbe82fee..8260a2671 100644
--- a/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h
+++ b/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h
@@ -42,7 +42,7 @@
 #ifndef QWAYLANDBRCMEGLPLATFORMINTEGRATION_H
 #define QWAYLANDBRCMEGLPLATFORMINTEGRATION_H
 
-#include <QtWaylandClient/qwaylandintegration.h>
+#include <QtWaylandClient/private/qwaylandintegration_p.h>
 #include "qwaylandbrcmeglintegration.h"
 
 QT_BEGIN_NAMESPACE
@@ -52,16 +52,17 @@ class QWaylandBrcmEglPlatformIntegration : public QWaylandIntegration
 public:
     QWaylandBrcmEglPlatformIntegration()
         : QWaylandIntegration()
-        , m_gl_integration(new QWaylandBrcmEglIntegration(display())
+        , m_gl_integration(new QWaylandBrcmEglIntegration())
     {
+        m_gl_integration->initialize(display());
     }
 
-    QWaylandGLIntegration *glIntegration() const Q_DECL_OVERRIDE
+    QWaylandClientBufferIntegration *clientBufferIntegration() const Q_DECL_OVERRIDE
     {
         return m_gl_integration;
     }
 private:
-    QWaylandGLIntegration *m_gl_integration;
+    QWaylandClientBufferIntegration *m_gl_integration;
 };
 
 QT_END_NAMESPACE