diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2021-02-09 12:27:08 +0200 |
|---|---|---|
| committer | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2021-02-11 11:25:36 +0200 |
| commit | 1a6f97656754887176b9576ab0a17dd145f0a016 (patch) | |
| tree | 901ccbd3fd67a4231b9e0546a4b0b0e7c912c03d /tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp | |
| parent | a87f31f2321f5cc838da3827c579f865842a64a2 (diff) | |
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>
Diffstat (limited to 'tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp')
| -rw-r--r-- | tests/auto/cpptest/q3dsurface-heightproxy/tst_proxy.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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); |