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/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp | |
| 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/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp')
| -rw-r--r-- | src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp index 372957f8a..68d38c498 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp @@ -55,8 +55,8 @@ static const char *qwaylandegl_threadedgl_blacklist_vendor[] = { 0 }; -QWaylandEglClientBufferIntegration::QWaylandEglClientBufferIntegration(QWaylandDisplay *display) - : m_waylandDisplay(display->wl_display()) +QWaylandEglClientBufferIntegration::QWaylandEglClientBufferIntegration() + : m_waylandDisplay(0) , m_supportsThreading(false) { qDebug() << "Using Wayland-EGL"; @@ -68,13 +68,15 @@ QWaylandEglClientBufferIntegration::~QWaylandEglClientBufferIntegration() eglTerminate(m_eglDisplay); } -void QWaylandEglClientBufferIntegration::initialize() +void QWaylandEglClientBufferIntegration::initialize(QWaylandDisplay *display) { QByteArray eglPlatform = qgetenv("EGL_PLATFORM"); if (eglPlatform.isEmpty()) { setenv("EGL_PLATFORM","wayland",true); } + m_waylandDisplay = display->wl_display(); + EGLint major,minor; m_eglDisplay = eglGetDisplay((EGLNativeDisplayType) m_waylandDisplay); if (m_eglDisplay == NULL) { |