diff options
| -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)); } } |