From 02df453d7436445e592170ba5a52684c5e0a7b64 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Fri, 31 Dec 2021 15:32:32 +0200 Subject: Bump version --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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=- -- cgit v1.2.3 From 0ed3e6ed1366bb0d2e9437c6f422c272363931bf Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Thu, 13 Jan 2022 09:17:14 +0200 Subject: Use signalspy instead of processevents Fixes: QTBUG-99764 Change-Id: I5e23c56d8fb2233201f3b54d91681d8c357d496a Reviewed-by: Miikka Heikkinen Reviewed-by: Sami Varanka --- tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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()); -- cgit v1.2.3 From 740dd1c0e98f0764ebf3ff902925322c3220f6a5 Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Wed, 16 Feb 2022 10:31:04 +0200 Subject: Fix autotest failure Fixes: QTBUG-100815 Change-Id: I473fed86f2378624867ddbf7a6f36ccce4274a1f Reviewed-by: Sami Varanka Reviewed-by: Qt CI Bot Reviewed-by: Miikka Heikkinen --- tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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; -- cgit v1.2.3