diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-18 22:07:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-18 22:07:42 +0200 |
| commit | dcff152a9b010455af1c1a29e5470f1350a48fe3 (patch) | |
| tree | b0eb2f1a8b1a3aa9ecdbd02ce936ae26eefcd992 /src/hardwareintegration/client | |
| parent | 5f62af28b2238097f99119317cd708d68ac1249b (diff) | |
| parent | a92eab837f7a7088ddd26bda2bb10d47c9c12142 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I436178527be54fd0efa6ffbe39918740d4737478
Diffstat (limited to 'src/hardwareintegration/client')
3 files changed, 3 insertions, 9 deletions
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/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(); 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 |