diff options
author | Jorgen Lind <jorgen.lind@digia.com> | 2014-01-14 12:26:42 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-15 15:11:35 +0100 |
commit | 87b33ff1081558433ac0d0ce6d055de5d09e3303 (patch) | |
tree | c6c4a981a8d67ee0e5b56365f613beb20405755c /src/plugins | |
parent | a848e7fe3c69b3eede115fbfe21e9024514bb226 (diff) |
Fixup the brcm-egl hardware integrations
Change-Id: I2a25c7d0b5019c30f31cba1f608a8731be6b1f10
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/plugins')
3 files changed, 10 insertions, 9 deletions
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) 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 |