From a7801fa3255ab5a1b73b51fa9f4090571885712f Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Wed, 30 Mar 2022 16:39:40 +0300
Subject: [PATCH] Android: hide() in the QAndroidPlatformMessageDialogHelper
 destructor

The native dialog window is not being hidden or destroyed when the
QAndroidPlatformMessageDialogHelper object is destroyed. This makes
sure to not leave any native dialogs open.

Pick-to: 6.2 6.3 6.3.0
Task-number: QTBUG-97482
Fixes: QTBUG-101758
Change-Id: I2e50caebd286ea6abd3e948a4873dc3c971626a4
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 .../platforms/android/qandroidplatformdialoghelpers.cpp      | 5 +++++
 .../platforms/android/qandroidplatformdialoghelpers.h        | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp b/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp
index 334dd31d9a..a38bd31084 100644
--- a/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp
+++ b/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp
@@ -60,6 +60,11 @@ QAndroidPlatformMessageDialogHelper::QAndroidPlatformMessageDialogHelper()
 {
 }
 
+QAndroidPlatformMessageDialogHelper::~QAndroidPlatformMessageDialogHelper()
+{
+    hide();
+}
+
 void QAndroidPlatformMessageDialogHelper::exec()
 {
     if (!m_shown)
diff --git a/src/plugins/platforms/android/qandroidplatformdialoghelpers.h b/src/plugins/platforms/android/qandroidplatformdialoghelpers.h
index 1953b842d5..7ad4633608 100644
--- a/src/plugins/platforms/android/qandroidplatformdialoghelpers.h
+++ b/src/plugins/platforms/android/qandroidplatformdialoghelpers.h
@@ -57,6 +57,8 @@ class QAndroidPlatformMessageDialogHelper: public QPlatformMessageDialogHelper
     Q_OBJECT
 public:
     QAndroidPlatformMessageDialogHelper();
+    ~QAndroidPlatformMessageDialogHelper();
+
     void exec() override;
     bool show(Qt::WindowFlags windowFlags,
               Qt::WindowModality windowModality,