diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-03-08 14:45:49 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-03-08 14:45:49 +0100 |
| commit | 85428526fb3e5a1605e8df2e009d333193809fae (patch) | |
| tree | 08ac5d72c773b2ad9cd27a87e29c5f4055fdbf35 /src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp | |
| parent | 95ed69bd08f424b80524414fbc0456f315353cf5 (diff) | |
| parent | 19260d9846861212881e374229798b3863d1a78d (diff) | |
Merge remote-tracking branch 'qt/5.6' into 5.7
Change-Id: Iada0e076ee33e8d39ecc4f40edfd9764ba610c03
Diffstat (limited to 'src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp')
| -rw-r--r-- | src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp index b4f5ca37e..f9b6fc1de 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp @@ -62,6 +62,7 @@ QWaylandXCompositeEGLWindow::QWaylandXCompositeEGLWindow(QWindow *window, QWayla , m_xWindow(0) , m_config(q_configFromGLFormat(glxIntegration->eglDisplay(), window->format(), true, EGL_WINDOW_BIT | EGL_PIXMAP_BIT)) , m_surface(0) + , mBuffer(0) { } |