diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-02 03:01:32 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-02 03:01:32 +0200 |
| commit | 9c5d1b634ea82fdc1b09713da4565b905d2c9123 (patch) | |
| tree | e6ec5749163a5b4691d0304a9f287110f7353718 /src/hardwareintegration | |
| parent | 0fbc2f68c87e0057ed7df3ad500c7dfe5c61d9d8 (diff) | |
| parent | a1ca3ae56f33bff34db71d1dec6104d0d6614e6d (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I4bd7389958fcee8b16d131625280c7d125894212
Diffstat (limited to 'src/hardwareintegration')
| -rw-r--r-- | src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp index 1467d8c9a..e58403ad0 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp @@ -402,7 +402,8 @@ bool QWaylandGLContext::makeCurrent(QPlatformSurface *surface) if (!window->needToUpdateContentFBO() && (eglSurface != EGL_NO_SURFACE && eglGetCurrentContext() == m_context && eglGetCurrentSurface(EGL_DRAW) == eglSurface)) return true; - window->setCanResize(false); + if (window->isExposed()) + window->setCanResize(false); // Core profiles mandate the use of VAOs when rendering. We would then need to use one // in DecorationsBlitter, but for that we would need a QOpenGLFunctions_3_2_Core instead // of the QOpenGLFunctions we use, but that would break when using a lower version context. |