diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-07 03:00:22 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-07 03:00:22 +0200 |
| commit | d79f7c12db1a21097ab1bf7e2cf87e7b88b1ae9f (patch) | |
| tree | b85d933f56fd98f19ee911130b8950a9a40cc03e | |
| parent | f4527f1581486b99d2699b2675ad5d258bc8a7fc (diff) | |
| parent | a6cfa65eae4d15c7ad5e7411d998332179080fbd (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I7947816edbfef4e07d488d25122cfd9a969436db
3 files changed, 10 insertions, 8 deletions
diff --git a/examples/wayland/qwindow-compositor/compositor.cpp b/examples/wayland/qwindow-compositor/compositor.cpp index 8ba8929e1..e224cd1c3 100644 --- a/examples/wayland/qwindow-compositor/compositor.cpp +++ b/examples/wayland/qwindow-compositor/compositor.cpp @@ -72,8 +72,11 @@ View::View(Compositor *compositor) QOpenGLTexture *View::getTexture() { - if (advance()) { - QWaylandBufferRef buf = currentBuffer(); + bool newContent = advance(); + QWaylandBufferRef buf = currentBuffer(); + if (!buf.hasContent()) + m_texture = nullptr; + if (newContent) { m_texture = buf.toOpenGLTexture(); if (surface()) { m_size = surface()->size(); diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri index e5df0f1ff..4a0c0aa63 100644 --- a/src/compositor/compositor_api/compositor_api.pri +++ b/src/compositor/compositor_api/compositor_api.pri @@ -27,7 +27,6 @@ HEADERS += \ compositor_api/qwaylandresource.h \ compositor_api/qwaylandsurfacegrabber.h \ compositor_api/qwaylandoutputmode_p.h \ - compositor_api/qwaylandquickhardwarelayer_p.h \ SOURCES += \ compositor_api/qwaylandcompositor.cpp \ @@ -44,8 +43,7 @@ SOURCES += \ compositor_api/qwaylanddestroylistener.cpp \ compositor_api/qwaylandview.cpp \ compositor_api/qwaylandresource.cpp \ - compositor_api/qwaylandsurfacegrabber.cpp \ - compositor_api/qwaylandquickhardwarelayer.cpp + compositor_api/qwaylandsurfacegrabber.cpp qtConfig(im) { HEADERS += \ @@ -71,14 +69,16 @@ qtHaveModule(quick):qtConfig(opengl) { compositor_api/qwaylandquickcompositor.cpp \ compositor_api/qwaylandquicksurface.cpp \ compositor_api/qwaylandquickoutput.cpp \ - compositor_api/qwaylandquickitem.cpp + compositor_api/qwaylandquickitem.cpp \ + compositor_api/qwaylandquickhardwarelayer.cpp HEADERS += \ compositor_api/qwaylandquickcompositor.h \ compositor_api/qwaylandquicksurface.h \ compositor_api/qwaylandquickoutput.h \ compositor_api/qwaylandquickitem.h \ - compositor_api/qwaylandquickitem_p.h + compositor_api/qwaylandquickitem_p.h \ + compositor_api/qwaylandquickhardwarelayer_p.h QT += qml qml-private quick quick-private } diff --git a/src/compositor/hardware_integration/qwlhardwarelayerintegration_p.h b/src/compositor/hardware_integration/qwlhardwarelayerintegration_p.h index 02de8e8be..1e5fb1a1b 100644 --- a/src/compositor/hardware_integration/qwlhardwarelayerintegration_p.h +++ b/src/compositor/hardware_integration/qwlhardwarelayerintegration_p.h @@ -54,7 +54,6 @@ #include <QtWaylandCompositor/qtwaylandcompositorglobal.h> #include <QObject> -#include <QQmlParserStatus> QT_BEGIN_NAMESPACE |