forked from qt-creator/qt-creator
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 <tim.jenssen@qt.io>
This commit is contained in:
@@ -20,7 +20,7 @@ class QmlDesignerBasePlugin::Data
|
||||
{
|
||||
public:
|
||||
DesignerSettings settings;
|
||||
Utils::UniqueObjectPtr<StudioStyle> 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<StudioStyle>(QApplication::style());
|
||||
global->d->style = new StudioStyle(QApplication::style());
|
||||
|
||||
return global->d->style.get();
|
||||
return global->d->style;
|
||||
}
|
||||
|
||||
StudioConfigSettingsPage *QmlDesignerBasePlugin::studioConfigSettingsPage()
|
||||
|
Reference in New Issue
Block a user