diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2023-04-21 14:14:48 +0200 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2023-04-21 12:42:46 +0000 |
| commit | 94256c52f218cd92ec50e432be50f11b65303733 (patch) | |
| tree | ab8787956e67f581dddaf42bb5a3c32a398320f7 | |
| parent | 81cb581e4ac11ae3e2a7d730fc26592f667736c3 (diff) | |
| download | qt-creator-94256c52f218cd92ec50e432be50f11b65303733.tar.gz | |
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>
| -rw-r--r-- | src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp | 6 |
1 files 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<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() |