diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2018-08-24 15:00:12 +0200 |
|---|---|---|
| committer | Jesus Fernandez <Jesus.Fernandez@qt.io> | 2018-10-01 10:25:39 +0000 |
| commit | 36d9bcc2cf1f26afe7e336b13ce59aae54e3cec8 (patch) | |
| tree | dec68a54ff8002d36702ad94c7c1154e4763e7bd | |
| parent | 870a8f2cbec11696d5e378825e82fbb707cc4eaf (diff) | |
Fix rendering updatev5.12.0-beta1
This patch fixes the rendering updates after the commit
4d15f393a76cfcc4d54f311884fedac5bf0f72ee. Ensures the render update
after hiding the window. It sets the value of updateRequestPending
to false to allow continuing rendering after a client disconnects.
Task-number: QTBUG-70191
Change-Id: I1e72f5af8ee3f7deebb2e35081961764e30db0d2
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
| -rw-r--r-- | src/plugins/platforms/webgl/qwebglwindow.cpp | 3 | ||||
| -rw-r--r-- | tests/plugins/platforms/webgl/tst_webgl.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/webgl/qwebglwindow.cpp b/src/plugins/platforms/webgl/qwebglwindow.cpp index 9bc0b7c..93a77bc 100644 --- a/src/plugins/platforms/webgl/qwebglwindow.cpp +++ b/src/plugins/platforms/webgl/qwebglwindow.cpp @@ -36,6 +36,7 @@ #include <QtCore/qtextstream.h> #include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qopenglcontext_p.h> +#include <QtGui/private/qwindow_p.h> #include <QtGui/qpa/qwindowsysteminterface.h> #include <QtGui/qpa/qplatformintegration.h> #include <QtGui/qopenglcontext.h> @@ -114,6 +115,8 @@ void QWebGLWindow::destroy() invalidateSurface(); } + qt_window_private(window())->updateRequestPending = false; + d->flags = 0; auto integrationPrivate = QWebGLIntegrationPrivate::instance(); diff --git a/tests/plugins/platforms/webgl/tst_webgl.cpp b/tests/plugins/platforms/webgl/tst_webgl.cpp index 773f5da..478a2e9 100644 --- a/tests/plugins/platforms/webgl/tst_webgl.cpp +++ b/tests/plugins/platforms/webgl/tst_webgl.cpp @@ -521,8 +521,6 @@ void tst_WebGL::update() sendMouseClick(0, 0, currentContext->winId); { QSignalSpy spy(this, &tst_WebGL::queryCommand); - QEXPECT_FAIL("Launcher", "QWindowPrivate::updateRequestPending is false, no more updates", - Abort); QTRY_VERIFY(findSwapBuffers(spy)); } } |