diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-17 15:17:01 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-17 15:46:57 +0000 |
| commit | 2ed6a9af87f543d353bdd8c5dab868b566904ce6 (patch) | |
| tree | cc09d86563b1922b54b142eefb7f249f22fbec3f | |
| parent | 875ddb2b25496fc114d443369c22ea9fd27568a6 (diff) | |
Do not keep QML engines alive across qmlClearTypeRegistrations()
Otherwise the builtins don't get re-registered afterwards.
Fixes: QTBUG-94575
Change-Id: I7fa4965d5147adf0cc437d1b6102815cc206a6ea
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 13a1355130daa6f345433fd4b35fb0bc55a0d901)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tests/auto/shared/visualtestutil.h | 3 |
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()); |