Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl

Change-Id: I862d6eb367406b508db2ad18ebbc1f2d89ed5a99

2 files changed, 5 insertions, 4 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());
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;