aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/shared/visualtestutil.h
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2021-06-17 15:17:01 +0200
committerUlf Hermann <ulf.hermann@qt.io>2021-06-17 16:54:22 +0200
commit13a1355130daa6f345433fd4b35fb0bc55a0d901 (patch)
treeb1ec8ef571bc2a208997f126fa7ee9269c7b6b41 /tests/auto/shared/visualtestutil.h
parentf8db2b996f339ad7e0754cd232f1e71ebecf6367 (diff)
Do not keep QML engines alive across qmlClearTypeRegistrations()
Otherwise the builtins don't get re-registered afterwards. Fixes: QTBUG-94575 Pick-to: 6.2 Change-Id: I7fa4965d5147adf0cc437d1b6102815cc206a6ea Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/shared/visualtestutil.h')
-rw-r--r--tests/auto/shared/visualtestutil.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/shared/visualtestutil.h b/tests/auto/shared/visualtestutil.h
index 4fdab95d..142aefd2 100644
--- a/tests/auto/shared/visualtestutil.h
+++ b/tests/auto/shared/visualtestutil.h
@@ -204,9 +204,10 @@ namespace QQuickVisualTestUtil
if (!currentStyle.isEmpty() && style == currentStyle)
return false;
- engine.reset(new QQmlEngine);
+ engine.reset();
currentStyle = style;
qmlClearTypeRegistrations();
+ engine.reset(new QQmlEngine);
QQuickStyle::setStyle(style);
QQmlComponent component(engine.data());