forked from qt-creator/qt-creator
qmljseditor: fix crash at shutdown
Change-Id: Ifae7ec5f378c0b2d3e667bd26a509fbcbefadecf Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
This commit is contained in:
@@ -110,6 +110,7 @@ QmlJSEditorPlugin::QmlJSEditorPlugin()
|
|||||||
|
|
||||||
QmlJSEditorPlugin::~QmlJSEditorPlugin()
|
QmlJSEditorPlugin::~QmlJSEditorPlugin()
|
||||||
{
|
{
|
||||||
|
delete QmlJS::Icons::instance(); // delete object held by singleton
|
||||||
delete d;
|
delete d;
|
||||||
d = nullptr;
|
d = nullptr;
|
||||||
m_instance = nullptr;
|
m_instance = nullptr;
|
||||||
@@ -226,8 +227,6 @@ void QmlJSEditorPlugin::extensionsInitialized()
|
|||||||
|
|
||||||
ExtensionSystem::IPlugin::ShutdownFlag QmlJSEditorPlugin::aboutToShutdown()
|
ExtensionSystem::IPlugin::ShutdownFlag QmlJSEditorPlugin::aboutToShutdown()
|
||||||
{
|
{
|
||||||
delete QmlJS::Icons::instance(); // delete object held by singleton
|
|
||||||
|
|
||||||
return IPlugin::aboutToShutdown();
|
return IPlugin::aboutToShutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user