From 49eb590a92c95100f5e3ac6f5b2861d0c1213cd9 Mon Sep 17 00:00:00 2001 From: Jorgen Lind Date: Thu, 21 Nov 2013 14:46:38 +0100 Subject: [PATCH] Change constructor of QWaylandClientBufferIntegration For QWaylandClientBufferIntegrations to be loadable from plugins the constructor shold not take any arguments, but give the display in the initialize function Change-Id: Ie38555120d7f29c6ba7eef0f095837235782684d Reviewed-by: Andy Nichols --- .../hardwareintegration/qwaylandclientbufferintegration.h | 2 +- src/plugins/platforms/wayland/qwaylandintegration.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration.h index 12468537e40..7f4fde9b3b6 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration.h +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration.h @@ -60,7 +60,7 @@ public: QWaylandClientBufferIntegration(); virtual ~QWaylandClientBufferIntegration(); - virtual void initialize() = 0; + virtual void initialize(QWaylandDisplay *display) = 0; virtual bool waitingForEvents() { return false; } virtual bool supportsThreadedOpenGL() const { return false; } diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp index 3c0c12e4f10..4c10061943d 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.cpp +++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp @@ -258,6 +258,8 @@ void QWaylandIntegration::initializeBufferIntegration() if (keys.contains(targetKey)) { mClientBufferIntegration = QWaylandClientBufferIntegrationFactory::create(targetKey, QStringList()); } + if (mClientBufferIntegration) + mClientBufferIntegration->initialize(mDisplay); } QT_END_NAMESPACE