diff options
| author | Jorgen Lind <jorgen.lind@digia.com> | 2013-11-21 14:46:38 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-27 15:32:48 +0100 |
| commit | 5361e7778c31ad8da53be2c394faba6c2f3b7f3d (patch) | |
| tree | 0869806d379c8ef610257a1248d41599d4fc0488 /src/plugins | |
| parent | ab30cabb6383413ee3b2913615d75082c0c55686 (diff) | |
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 <andy.nichols@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h index a6c572466..2dbc15412 100644 --- a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h +++ b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h @@ -53,9 +53,9 @@ class QWaylandEglPlatformIntegration : public QWaylandIntegration public: QWaylandEglPlatformIntegration() : QWaylandIntegration() - , m_client_buffer_integration(new QWaylandEglClientBufferIntegration(display())) + , m_client_buffer_integration(new QWaylandEglClientBufferIntegration()) { - m_client_buffer_integration->initialize(); + m_client_buffer_integration->initialize(display()); } QWaylandEglClientBufferIntegration *clientBufferIntegration() const diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h index 528a7d054..3d225a34a 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h +++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h @@ -53,8 +53,10 @@ class QWaylandXCompositeEglPlatformIntegration : public QWaylandIntegration public: QWaylandXCompositeEglPlatformIntegration() : QWaylandIntegration() - , m_client_buffer_integration(new QWaylandXCompositeEGLClientBufferIntegration(display())) - { } + , m_client_buffer_integration(new QWaylandXCompositeEGLClientBufferIntegration()) + { + m_client_buffer_integration->initialize(display()); + } QWaylandClientBufferIntegration *clientBufferIntegration() const Q_DECL_OVERRIDE { return m_client_buffer_integration; } |