summaryrefslogtreecommitdiffstats
path: root/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@qt.io>2019-06-05 13:21:22 +0200
committerPaul Olav Tvete <paul.tvete@qt.io>2019-06-05 13:21:22 +0200
commit70d422afb8f631e14140f22b01256013b28b7034 (patch)
tree7e2e2155cb976122a6d586a9e6d00c3210ba1f0d /src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp
parentd829ba99c862efbdb6a040627176913a8a1e3847 (diff)
parentcde2fe3fba31b9b8d258f0663bc34009fd769efd (diff)
Merge remote-tracking branch 'qt/5.12' into texturesharing-5.12
Diffstat (limited to 'src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp')
-rw-r--r--src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp
index c07ad5342..a6fead95c 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp
@@ -65,7 +65,7 @@ void QWaylandXCompositeEGLContext::swapBuffers(QPlatformSurface *surface)
QSize size = w->geometry().size();
w->commit(w->buffer(), QRegion(0, 0, size.width(), size.height()));
- w->waitForFrameSync();
+ w->waitForFrameSync(100);
}
EGLSurface QWaylandXCompositeEGLContext::eglSurfaceForPlatformSurface(QPlatformSurface *surface)