aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@qt.io>2021-10-04 17:29:39 +0200
committerTim Jenssen <tim.jenssen@qt.io>2021-10-06 14:48:02 +0000
commit7d5c9be52b94f15bdc9c56799e81ae241535fd38 (patch)
treed980ae96fd1a081d8416743cfd38667bcd4ee997
parent9dd6b59983b607aacd3b582ea6ed3970f82f945f (diff)
qmljseditor: fix crash at shutdown
Change-Id: Ifae7ec5f378c0b2d3e667bd26a509fbcbefadecf Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r--src/plugins/qmljseditor/qmljseditorplugin.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index e0d5703102..59cafdcfc1 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -110,6 +110,7 @@ QmlJSEditorPlugin::QmlJSEditorPlugin()
QmlJSEditorPlugin::~QmlJSEditorPlugin()
{
+ delete QmlJS::Icons::instance(); // delete object held by singleton
delete d;
d = nullptr;
m_instance = nullptr;
@@ -226,8 +227,6 @@ void QmlJSEditorPlugin::extensionsInitialized()
ExtensionSystem::IPlugin::ShutdownFlag QmlJSEditorPlugin::aboutToShutdown()
{
- delete QmlJS::Icons::instance(); // delete object held by singleton
-
return IPlugin::aboutToShutdown();
}