diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-10 22:42:28 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-10 22:42:28 +0200 |
commit | 9f0f50ebef04d5ac5ed0ee2a3a71e7748fce3005 (patch) | |
tree | 65dd1381f3af11a4dc88e6a1f73c0c52c356d902 | |
parent | 8e1a57efa1ba3eabbf44098ce6ede3d130c57b5d (diff) | |
parent | 1f3e19304416abf8a8473d0349aa04746b3a33b6 (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into tqtc/lts-5.15-opensourcev5.15.8-lts-lgpl
Change-Id: I9476212923e64ccdf85f94753297e03227bd5ea9
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp | 4 | ||||
-rw-r--r-- | tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index f537d2ce..b6458758 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,6 +2,6 @@ load(qt_build_config) DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.7 +MODULE_VERSION = 5.15.8 CONFIG += warning_clean CMAKE_MODULE_TESTS=- diff --git a/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp index dfeee506..18fa0296 100644 --- a/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp +++ b/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp @@ -258,7 +258,9 @@ void tst_proxy::multiMatch() graph.addSeries(series); - QCoreApplication::processEvents(); + QSignalSpy spy(graph.valueAxis(), SIGNAL(maxChanged(float))); + spy.wait(1000); + QCOMPARE(graph.valueAxis()->max(), 6.5f); m_proxy->setMultiMatchBehavior(QItemModelBarDataProxy::MMBFirst); QCoreApplication::processEvents(); diff --git a/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp index eb984c1a..c1039c85 100644 --- a/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp +++ b/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp @@ -274,8 +274,9 @@ void tst_proxy::multiMatch() QSurface3DSeries *series = new QSurface3DSeries(m_proxy); graph.addSeries(series); + QSignalSpy spy(graph.axisY(), SIGNAL(maxChanged(float))); + spy.wait(1000); - QCoreApplication::processEvents(); QCOMPARE(graph.axisY()->max(), 10.5f); m_proxy->setMultiMatchBehavior(QItemModelSurfaceDataProxy::MMBFirst); QCoreApplication::processEvents(); |