From 13a1355130daa6f345433fd4b35fb0bc55a0d901 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Thu, 17 Jun 2021 15:17:01 +0200
Subject: 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>
---
 tests/auto/shared/visualtestutil.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/auto/shared')

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());
-- 
cgit v1.2.3