diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-03-30 16:39:40 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-04-04 11:31:08 +0000 |
| commit | 3a67ee1340d156374dfefdf932c02693f9f00000 (patch) | |
| tree | ab2ea813f0e41cca2fc90bd2c21b6925c61ee557 | |
| parent | b55bb06fb2489d4e153bb5dcbe360df22484da08 (diff) | |
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.
Task-number: QTBUG-97482
Fixes: QTBUG-101758
Change-Id: I2e50caebd286ea6abd3e948a4873dc3c971626a4
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit a7801fa3255ab5a1b73b51fa9f4090571885712f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformdialoghelpers.h | 2 |
2 files changed, 7 insertions, 0 deletions
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, |