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

 Conflicts:
	tests/auto/network/socket/platformsocketengine/platformsocketengine.pri

Change-Id: I22daf269a8f28f80630b5f521b91637531156404

2 files changed, 7 insertions, 5 deletions

diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
index f457f69f11..0c2c0d0b68 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.cpp
+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
@@ -103,17 +103,18 @@ QMinimalIntegration::QMinimalIntegration(const QStringList &parameters)
         m_options |= DebugBackingStore | EnableFonts;
     }
 
-    QMinimalScreen *mPrimaryScreen = new QMinimalScreen();
+    m_primaryScreen = new QMinimalScreen();
 
-    mPrimaryScreen->mGeometry = QRect(0, 0, 240, 320);
-    mPrimaryScreen->mDepth = 32;
-    mPrimaryScreen->mFormat = QImage::Format_ARGB32_Premultiplied;
+    m_primaryScreen->mGeometry = QRect(0, 0, 240, 320);
+    m_primaryScreen->mDepth = 32;
+    m_primaryScreen->mFormat = QImage::Format_ARGB32_Premultiplied;
 
-    QWindowSystemInterface::handleScreenAdded(mPrimaryScreen);
+    QWindowSystemInterface::handleScreenAdded(m_primaryScreen);
 }
 
 QMinimalIntegration::~QMinimalIntegration()
 {
+    QWindowSystemInterface::handleScreenRemoved(m_primaryScreen);
     delete m_fontDatabase;
 }
 
diff --git a/src/plugins/platforms/minimal/qminimalintegration.h b/src/plugins/platforms/minimal/qminimalintegration.h
index ad1bec2112..f9c66e0c3e 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.h
+++ b/src/plugins/platforms/minimal/qminimalintegration.h
@@ -88,6 +88,7 @@ public:
 
 private:
     mutable QPlatformFontDatabase *m_fontDatabase;
+    QMinimalScreen *m_primaryScreen;
     unsigned m_options;
 };