From 53c1cbcdae80f7036f0d1b8bd8dffbdc70ff3a9e Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Sat, 18 Mar 2017 03:40:30 -0700 Subject: Fix brcm-egl build by correcting commit() usage Adjusted existing call to commit() in keeping with parallel changes in 5b807802 Change-Id: I31c17336efa9a79a5f6c1719702215db7239a97d Reviewed-by: Simon Hausmann --- src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/hardwareintegration/client') diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp index 22618b4aa..9842f61c9 100644 --- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp +++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp @@ -252,9 +252,7 @@ void QWaylandBrcmEglWindow::swapBuffers() return; m_buffers[m_current]->bind(); - attach(m_buffers[m_current], 0, 0); - damage(QRect(QPoint(), geometry().size())); - wl_surface::commit(); + commit(m_buffers[m_current], QRegion(0, 0, geometry().size().width(), geometry().size().height())); m_current = (m_current + 1) % m_count; m_buffers[m_current]->waitForRelease(); -- cgit v1.2.3 From a92eab837f7a7088ddd26bda2bb10d47c9c12142 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 13 Feb 2017 09:47:28 +0100 Subject: switch to new way to refer to libdl Change-Id: I9269bb0902b0a5b5d8581d79fa9568122ee0641b Reviewed-by: Joerg Bornemann --- src/hardwareintegration/client/brcm-egl/brcm-egl.pri | 4 +--- src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'src/hardwareintegration/client') diff --git a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri index 3961f4f1e..f9f8d0726 100644 --- a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri +++ b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri @@ -1,10 +1,8 @@ INCLUDEPATH += $$PWD -QMAKE_USE += egl wayland-client +QMAKE_USE += egl wayland-client libdl QT += egl_support-private -LIBS_PRIVATE += $$QMAKE_LIBS_DYNLOAD - SOURCES += $$PWD/qwaylandbrcmeglintegration.cpp \ $$PWD/qwaylandbrcmglcontext.cpp \ $$PWD/qwaylandbrcmeglwindow.cpp diff --git a/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri b/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri index 2307319af..a2f5376a9 100644 --- a/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri +++ b/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri @@ -1,9 +1,7 @@ INCLUDEPATH += $$PWD include ($$PWD/../xcomposite_share/xcomposite_share.pri) -QMAKE_USE += wayland-client glx - -LIBS_PRIVATE += $$QMAKE_LIBS_DYNLOAD +QMAKE_USE += wayland-client glx libdl QT += glx_support-private -- cgit v1.2.3