Merge remote-tracking branch 'origin/5.8.0' into 5.8

Change-Id: I19804e880005c66880eeabfaebf0b1093de80e6b

1 files changed, 4 insertions, 1 deletions

diff --git a/src/qml/debugger/qqmldebugconnector.cpp b/src/qml/debugger/qqmldebugconnector.cpp
index 23440e7529..dd34bb910f 100644
--- a/src/qml/debugger/qqmldebugconnector.cpp
+++ b/src/qml/debugger/qqmldebugconnector.cpp
@@ -152,7 +152,10 @@ QQmlDebugConnectorFactory::~QQmlDebugConnectorFactory()
 {
     // This is triggered when the plugin is unloaded.
     QQmlDebugConnectorParams *params = qmlDebugConnectorParams();
-    if (params && params->instance) {
+    if (params) {
+        params->pluginKey.clear();
+        params->arguments.clear();
+        params->services.clear();
         delete params->instance;
         params->instance = 0;
     }