diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-30 03:03:23 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-30 03:03:23 +0100 |
| commit | 3bd008ae85a51cbcfec1e6710271f117a44b3f92 (patch) | |
| tree | f063445d9a69eb349d9dd57e3455308751a2efeb /src/client/qwaylandshmbackingstore.cpp | |
| parent | add794a5b732608dcd5d99a433f4a61d20838482 (diff) | |
| parent | 52876056ff3dcda97f93932bc8c6e1c0fbce9d5e (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I1d9281750b06f7584e55759994dc6fcbcc5b2455
Diffstat (limited to 'src/client/qwaylandshmbackingstore.cpp')
| -rw-r--r-- | src/client/qwaylandshmbackingstore.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/client/qwaylandshmbackingstore.cpp b/src/client/qwaylandshmbackingstore.cpp index 8cc9598fa..34044ec9b 100644 --- a/src/client/qwaylandshmbackingstore.cpp +++ b/src/client/qwaylandshmbackingstore.cpp @@ -233,8 +233,7 @@ void QWaylandShmBackingStore::flush(QWindow *window, const QRegion ®ion, cons mFrontBuffer = mBackBuffer; QMargins margins = windowDecorationMargins(); - - waylandWindow()->commit(mFrontBuffer, region.translated(margins.left(), margins.top())); + waylandWindow()->safeCommit(mFrontBuffer, region.translated(margins.left(), margins.top())); } void QWaylandShmBackingStore::resize(const QSize &size, const QRegion &) |