diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:06 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:06 +0200 |
| commit | 7636478bb30f0af8afe9af429eb8512d6fbcc11b (patch) | |
| tree | a3e8bfa36583eda4860282e1bb9dd9541834394b | |
| parent | 9f0f50ebef04d5ac5ed0ee2a3a71e7748fce3005 (diff) | |
| parent | 740dd1c0e98f0764ebf3ff902925322c3220f6a5 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl
Change-Id: I862d6eb367406b508db2ad18ebbc1f2d89ed5a99
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index b6458758..637430d4 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.8 +MODULE_VERSION = 5.15.9 CONFIG += warning_clean CMAKE_MODULE_TESTS=- diff --git a/tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp index 8e17f6bb..ecb4e8c2 100644 --- a/tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp +++ b/tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp @@ -192,9 +192,9 @@ void tst_proxy::addModel() m_proxy->setZPosRoleReplace(QStringLiteral("\\1")); QScatter3DSeries *series = new QScatter3DSeries(m_proxy); - Q_UNUSED(series) - QCoreApplication::processEvents(); + QSignalSpy spy(series, SIGNAL(dataProxyChanged(QScatterDataProxy *))); + spy.wait(1000); QCOMPARE(m_proxy->itemCount(), 2); QVERIFY(m_proxy->series()); diff --git a/tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp index e031688c..99b30af9 100644 --- a/tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp +++ b/tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp @@ -80,15 +80,16 @@ void tst_proxy::construct() QImage image(QSize(10, 10), QImage::Format_ARGB32); image.fill(0); proxy = new QHeightMapSurfaceDataProxy(image); + QSignalSpy spy(proxy, SIGNAL(columnCountChanged(int))); QVERIFY(proxy); - QCoreApplication::processEvents(); + spy.wait(1000); QCOMPARE(proxy->columnCount(), 10); QCOMPARE(proxy->rowCount(), 10); delete proxy; proxy = new QHeightMapSurfaceDataProxy(":/customtexture.jpg"); QVERIFY(proxy); - QCoreApplication::processEvents(); + spy.wait(1000); QCOMPARE(proxy->columnCount(), 24); QCOMPARE(proxy->rowCount(), 24); delete proxy; |