diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-26 21:43:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-26 21:43:25 +0200 |
| commit | 06bd93c4acf49fc24408a60ebdf7a46caf02f9b3 (patch) | |
| tree | eedbdaa40fbf20bb99187084dd9edf14f73f05bd /src/plugins/platforms/ios/qiosmessagedialog.mm | |
| parent | bafad505a0adb21b819f7617e5e802bf2d52fd54 (diff) | |
| parent | 41a7d74385eece725435159ca021151e871bf116 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/plugins/platforms/ios/qiosmessagedialog.mm
Change-Id: Icfbf55c3215ec088e552d0b42a5c94d04b17c65f
Diffstat (limited to 'src/plugins/platforms/ios/qiosmessagedialog.mm')
| -rw-r--r-- | src/plugins/platforms/ios/qiosmessagedialog.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/qiosmessagedialog.mm b/src/plugins/platforms/ios/qiosmessagedialog.mm index 1d078be0b9..4f0c667861 100644 --- a/src/plugins/platforms/ios/qiosmessagedialog.mm +++ b/src/plugins/platforms/ios/qiosmessagedialog.mm @@ -109,7 +109,7 @@ bool QIOSMessageDialog::show(Qt::WindowFlags windowFlags, Qt::WindowModality win Q_UNUSED(windowFlags); if (m_alertController // Ensure that the dialog is not showing already || !options() // Some message dialogs don't have options (QErrorMessage) - || windowModality != Qt::ApplicationModal // We can only do app modal dialogs + || windowModality == Qt::NonModal // We can only do modal dialogs || QOperatingSystemVersion::current() < QOperatingSystemVersion(QOperatingSystemVersion::IOS, 8)) // API limitation return false; |