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-10 12:49:19 +0200 |
commit | 33d47ef27ed26c49abb8cae3e9576defe0ea7e5b (patch) | |
tree | 901ccbd3fd67a4231b9e0546a4b0b0e7c912c03d /tests/auto/qmltest/tst_qmltest.cpp | |
parent | 824e0ba21a7b1e56264989c243c3138b09458751 (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
Pick-to: 6.1
Change-Id: I594040e8d504d680ff1990147835a106cc53d922
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Diffstat (limited to 'tests/auto/qmltest/tst_qmltest.cpp')
-rw-r--r-- | tests/auto/qmltest/tst_qmltest.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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); +} |