diff options
author | Ville Voutilainen <ville.voutilainen@qt.io> | 2019-08-09 08:29:28 +0300 |
---|---|---|
committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2019-08-09 10:18:06 +0300 |
commit | 6f44ad0f42bd93e60979501a5740dab92661b29c (patch) | |
tree | c38a5cbc2ac502d190ae69331301ba5f716d8153 /src | |
parent | f4636b934f90b2a07b09f1925a86440cf1944d08 (diff) |
Fix GCC 4.8 build
Change-Id: I0a193ceaa1549c08acad02b59db62ae313d6b334
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/client/qwaylandinputdevice.cpp | 4 | ||||
-rw-r--r-- | src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp | 35 |
2 files changed, 21 insertions, 18 deletions
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp index 7f6f01cd1..9ee3c19d4 100644 --- a/src/client/qwaylandinputdevice.cpp +++ b/src/client/qwaylandinputdevice.cpp @@ -570,7 +570,7 @@ void QWaylandInputDevice::Pointer::pointer_enter(uint32_t serial, struct wl_surf invalidateFocus(); } mFocus = window; - connect(mFocus, &QWaylandWindow::wlSurfaceDestroyed, this, &Pointer::handleFocusDestroyed); + connect(mFocus.data(), &QWaylandWindow::wlSurfaceDestroyed, this, &Pointer::handleFocusDestroyed); mSurfacePos = QPointF(wl_fixed_to_double(sx), wl_fixed_to_double(sy)); mGlobalPos = window->window()->mapToGlobal(mSurfacePos.toPoint()); @@ -707,7 +707,7 @@ void QWaylandInputDevice::Pointer::pointer_button(uint32_t serial, uint32_t time void QWaylandInputDevice::Pointer::invalidateFocus() { - disconnect(mFocus, &QWaylandWindow::wlSurfaceDestroyed, this, &Pointer::handleFocusDestroyed); + disconnect(mFocus.data(), &QWaylandWindow::wlSurfaceDestroyed, this, &Pointer::handleFocusDestroyed); mFocus = nullptr; mEnterSerial = 0; } diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp index d512613a7..cd2351e5d 100644 --- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp +++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp @@ -259,22 +259,25 @@ bool LinuxDmabufClientBufferIntegration::initYuvTexture(LinuxDmabufWlBuffer *dma LinuxDmabufClientBufferIntegration::LinuxDmabufClientBufferIntegration() { - m_yuvFormats.insert(DRM_FORMAT_YUYV, - YuvFormatConversion { - .inputPlanes = 1, - .outputPlanes = 2, - .plane = {{ - .format = DRM_FORMAT_GR88, - .widthDivisor = 1, - .heightDivisor = 1, - .planeIndex = 0 - }, { - .format = DRM_FORMAT_ARGB8888, - .widthDivisor = 2, - .heightDivisor = 1, - .planeIndex = 0 - }} - }); + YuvPlaneConversion firstPlane; + firstPlane.format = DRM_FORMAT_GR88; + firstPlane.widthDivisor = 1; + firstPlane.heightDivisor = 1; + firstPlane.planeIndex = 0; + + YuvPlaneConversion secondPlane; + secondPlane.format = DRM_FORMAT_ARGB8888; + secondPlane.widthDivisor = 2; + secondPlane.heightDivisor = 1; + secondPlane.planeIndex = 0; + + YuvFormatConversion formatConversion; + formatConversion.inputPlanes = 1; + formatConversion.outputPlanes = 2; + formatConversion.plane[0] = firstPlane; + formatConversion.plane[1] = secondPlane; + + m_yuvFormats.insert(DRM_FORMAT_YUYV, formatConversion); } LinuxDmabufClientBufferIntegration::~LinuxDmabufClientBufferIntegration() |