diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:09:24 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:09:24 +0300 |
| commit | ddcff45e8f2ca9f229017b3ded62327d2fb50af2 (patch) | |
| tree | 449ed5b21f1c36bffec8bb6431e419faacc783d3 | |
| parent | 13202e8a8c0c6d39026344b5a19a0148592160bc (diff) | |
| parent | d2bfc05d0d7bc3762521c2d42c81dcaa006f13cb (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl
Change-Id: Icaa6d06a0be440386a612c4b477c1358e0301db5
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | tests/plugins/platforms/webgl/tst_webgl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 2843da9..49a5525 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) DEFINES += QT_NO_JAVA_STYLE_ITERATORS DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.10 +MODULE_VERSION = 5.15.11 diff --git a/tests/plugins/platforms/webgl/tst_webgl.cpp b/tests/plugins/platforms/webgl/tst_webgl.cpp index 36b8ecf..ee43882 100644 --- a/tests/plugins/platforms/webgl/tst_webgl.cpp +++ b/tests/plugins/platforms/webgl/tst_webgl.cpp @@ -516,7 +516,7 @@ void tst_WebGL::update() { { QSignalSpy spy(this, &tst_WebGL::queryCommand); - QTRY_VERIFY(findSwapBuffers(spy)); + QTRY_VERIFY_WITH_TIMEOUT(findSwapBuffers(spy), 10000); QVERIFY(!QTest::currentTestFailed()); } sendMouseClick(0, 0, currentContext->winId); |