From 1a6f97656754887176b9576ab0a17dd145f0a016 Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Tue, 9 Feb 2021 12:27:08 +0200 Subject: Fix failing autotests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ä Reviewed-by: Janne Koskinen (cherry picked from commit 33d47ef27ed26c49abb8cae3e9576defe0ea7e5b) Reviewed-by: Tomi Korpipää --- tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/auto/cpptest/q3dsurface-modelproxy/tst_proxy.cpp') 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); -- cgit v1.2.3