From 7d5c9be52b94f15bdc9c56799e81ae241535fd38 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Mon, 4 Oct 2021 17:29:39 +0200
Subject: [PATCH] qmljseditor: fix crash at shutdown

Change-Id: Ifae7ec5f378c0b2d3e667bd26a509fbcbefadecf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
 src/plugins/qmljseditor/qmljseditorplugin.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index e0d57031020..59cafdcfc19 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();
 }