From 94256c52f218cd92ec50e432be50f11b65303733 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 21 Apr 2023 14:14:48 +0200 Subject: QmlDesigner: Fix crash on shutdown The style is owned by QApplication and QApplication does not expect the style to be deleted by QmlDesignerBasePlugin. Change-Id: Ia6526cf9920646a8a61d8c9847ab495fad382ea7 Reviewed-by: Tim Jenssen --- src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp b/src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp index 2a2759c300..c9af4f2283 100644 --- a/src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp +++ b/src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp @@ -20,7 +20,7 @@ class QmlDesignerBasePlugin::Data { public: DesignerSettings settings; - Utils::UniqueObjectPtr style; + StudioStyle *style = nullptr; StudioConfigSettingsPage studioConfigSettingsPage; Data() @@ -47,9 +47,9 @@ DesignerSettings &QmlDesignerBasePlugin::settings() QStyle *QmlDesignerBasePlugin::style() { if (!global->d->style) - global->d->style = Utils::makeUniqueObjectPtr(QApplication::style()); + global->d->style = new StudioStyle(QApplication::style()); - return global->d->style.get(); + return global->d->style; } StudioConfigSettingsPage *QmlDesignerBasePlugin::studioConfigSettingsPage() -- cgit v1.2.1