diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-03-30 16:39:40 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-04-01 21:11:35 +0000 |
| commit | a7801fa3255ab5a1b73b51fa9f4090571885712f (patch) | |
| tree | b03de3cd62eace285321af33e92777ad955d4815 /src/plugins/platforms/android | |
| parent | 9e1a2b4603c9791081481a34576970e1e6c85ef5 (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.
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>
Diffstat (limited to 'src/plugins/platforms/android')
| -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, |