feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix crash on shutdown

Browse Source 
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 <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2023-04-21 14:14:48 +02:00
parent 81cb581e4a
commit 94256c52f2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp
View File

@@ -20,7 +20,7 @@ class QmlDesignerBasePlugin::Data
{ {
public: public:
DesignerSettings settings; DesignerSettings settings;
Utils::UniqueObjectPtr<StudioStyle> style; StudioStyle *style = nullptr;
StudioConfigSettingsPage studioConfigSettingsPage; StudioConfigSettingsPage studioConfigSettingsPage;
Data() Data()
@@ -47,9 +47,9 @@ DesignerSettings &QmlDesignerBasePlugin::settings()
QStyle *QmlDesignerBasePlugin::style() QStyle *QmlDesignerBasePlugin::style()
{ {
if (!global->d->style) if (!global->d->style)
global->d->style = Utils::makeUniqueObjectPtr<StudioStyle>(QApplication::style()); global->d->style = new StudioStyle(QApplication::style());
return global->d->style.get(); return global->d->style;
} }
StudioConfigSettingsPage *QmlDesignerBasePlugin::studioConfigSettingsPage() StudioConfigSettingsPage *QmlDesignerBasePlugin::studioConfigSettingsPage()