Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I6cc3095673bb459acef93e3da8a67c3819b70d3a

1 files changed, 7 insertions, 0 deletions

diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index 443f0cb8..c495b6b2 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -77,6 +77,8 @@ class QtQuickControls2Plugin: public QQuickStylePlugin
 
 public:
     QtQuickControls2Plugin(QObject *parent = nullptr);
+    ~QtQuickControls2Plugin();
+
     void registerTypes(const char *uri) override;
 
     QString name() const override;
@@ -88,6 +90,11 @@ QtQuickControls2Plugin::QtQuickControls2Plugin(QObject *parent) : QQuickStylePlu
     initResources();
 }
 
+QtQuickControls2Plugin::~QtQuickControls2Plugin()
+{
+    QQuickStylePrivate::reset();
+}
+
 void QtQuickControls2Plugin::registerTypes(const char *uri)
 {
     QQuickStylePrivate::init(typeUrl());