From 87b33ff1081558433ac0d0ce6d055de5d09e3303 Mon Sep 17 00:00:00 2001
From: Jorgen Lind <jorgen.lind@digia.com>
Date: Tue, 14 Jan 2014 12:26:42 +0100
Subject: Fixup the brcm-egl hardware integrations

Change-Id: I2a25c7d0b5019c30f31cba1f608a8731be6b1f10
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
---
 src/plugins/hardwareintegration/client/brcm-egl/main.cpp         | 8 ++++----
 src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/plugins/hardwareintegration')

diff --git a/src/plugins/hardwareintegration/client/brcm-egl/main.cpp b/src/plugins/hardwareintegration/client/brcm-egl/main.cpp
index b7f376555..d1bef5e8c 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
 
@@ -60,11 +60,11 @@ QStringList QWaylandBrcmEglClientBufferPlugin::keys() const
     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();
+        return new QWaylandBrcmEglIntegration();
 
     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)
-- 
cgit v1.2.3