Fix failing autotests

QSG_RHI_BACKEND needs to be forced to opengl for the
QML test like in any other QML application.
Model/height proxy tests need a bit more time for the proxy
data to stabilize, so extra QCoreApplication::processEvents()
calls were added to handle that.

Fixes: QTBUG-90710
Change-Id: I594040e8d504d680ff1990147835a106cc53d922
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
(cherry picked from commit 33d47ef27ed26c49abb8cae3e9576defe0ea7e5b)
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

5 files changed, 11 insertions, 1 deletions

diff --git a/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp
index ca8984ff..dd5d7284 100644
--- a/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp
+++ b/tests/auto/cpptest/q3dbars-modelproxy/tst_proxy.cpp
@@ -251,6 +251,7 @@ void tst_proxy::multiMatch()
     m_proxy->setValueRoleReplace(QStringLiteral("\\3"));
     m_proxy->setColumnRolePattern(QRegularExpression(QStringLiteral("^(\\d*)(\\/)(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$")));
     m_proxy->setColumnRoleReplace(QStringLiteral("\\1"));
+    QCoreApplication::processEvents();
 
     QBar3DSeries *series = new QBar3DSeries(m_proxy);
 
diff --git a/tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp
index cd0f0b3a..9bcfbe8a 100644
--- a/tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp
+++ b/tests/auto/cpptest/q3dscatter-modelproxy/tst_proxy.cpp
@@ -188,6 +188,7 @@ void tst_proxy::addModel()
     m_proxy->setYPosRoleReplace(QStringLiteral("\\3"));
     m_proxy->setZPosRolePattern(QRegularExpression(QStringLiteral("^(\\d*)(\\/)(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$")));
     m_proxy->setZPosRoleReplace(QStringLiteral("\\1"));
+    QCoreApplication::processEvents();
 
     QScatter3DSeries *series = new QScatter3DSeries(m_proxy);
     Q_UNUSED(series);
diff --git a/tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp
index 5bb2862f..4bc88405 100644
--- a/tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp
+++ b/tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp
@@ -78,6 +78,7 @@ void tst_proxy::construct()
     QImage image(QSize(10, 10), QImage::Format_ARGB32);
     image.fill(0);
     proxy = new QHeightMapSurfaceDataProxy(image);
+    QCoreApplication::processEvents();
     QVERIFY(proxy);
     QCoreApplication::processEvents();
     QCOMPARE(proxy->columnCount(), 10);
@@ -85,6 +86,7 @@ void tst_proxy::construct()
     delete proxy;
 
     proxy = new QHeightMapSurfaceDataProxy(":/customtexture.jpg");
+    QCoreApplication::processEvents();
     QVERIFY(proxy);
     QCoreApplication::processEvents();
     QCOMPARE(proxy->columnCount(), 24);
diff --git a/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp b/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp
index 07411aa7..09c0c383 100644
--- a/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp
+++ b/tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp
@@ -268,6 +268,7 @@ void tst_proxy::multiMatch()
     m_proxy->setYPosRoleReplace(QStringLiteral("\\3"));
     m_proxy->setColumnRolePattern(QRegularExpression(QStringLiteral("^(\\d*)(\\/)(\\d*)\\/\\d*[\\.\\,]?\\d*\\/\\d*[\\.\\,]?\\d*$")));
     m_proxy->setColumnRoleReplace(QStringLiteral("\\1"));
+    QCoreApplication::processEvents();
 
     QSurface3DSeries *series = new QSurface3DSeries(m_proxy);
 
diff --git a/tests/auto/qmltest/tst_qmltest.cpp b/tests/auto/qmltest/tst_qmltest.cpp
index 6e2e0318..8cc3c85b 100644
--- a/tests/auto/qmltest/tst_qmltest.cpp
+++ b/tests/auto/qmltest/tst_qmltest.cpp
@@ -28,4 +28,9 @@
 ****************************************************************************/
 
 #include <QtQuickTest/quicktest.h>
-QUICK_TEST_MAIN(qmltest)
+int main(int argc, char **argv)
+{
+    qputenv("QSG_RHI_BACKEND", "opengl");
+    QTEST_SET_MAIN_SOURCE_PATH
+    return quick_test_main(argc, argv, "qmltest", QUICK_TEST_SOURCE_DIR);
+}