1 files changed, 18 insertions, 3 deletions
diff --git a/src/plugins/platforms/ios/qiosmessagedialog.mm b/src/plugins/platforms/ios/qiosmessagedialog.mm
index fd14e699e0..7fbd5d8729 100644
--- a/src/plugins/platforms/ios/qiosmessagedialog.mm
+++ b/src/plugins/platforms/ios/qiosmessagedialog.mm
@@ -11,6 +11,7 @@
 
 #include "qiosglobal.h"
 #include "quiview.h"
+#include "qiosscreen.h"
 #include "qiosmessagedialog.h"
 
 using namespace Qt::StringLiterals;
@@ -29,7 +30,7 @@ inline QString QIOSMessageDialog::messageTextPlain()
 {
     // Concatenate text fragments, and remove HTML tags
     const QSharedPointer<QMessageDialogOptions> &opt = options();
-    const QString &lineShift = QStringLiteral("\n\n");
+    constexpr auto lineShift = "\n\n"_L1;
     const QString &informativeText = opt->informativeText();
     const QString &detailedText = opt->detailedText();
 
@@ -39,7 +40,7 @@ inline QString QIOSMessageDialog::messageTextPlain()
     if (!detailedText.isEmpty())
         text += lineShift + detailedText;
 
-    text.replace("<p>"_L1, QStringLiteral("\n"), Qt::CaseInsensitive);
+    text.replace("<p>"_L1, "\n"_L1, Qt::CaseInsensitive);
     text.remove(QRegularExpression(QStringLiteral("<[^>]*>")));
 
     return text;
@@ -91,6 +92,9 @@ bool QIOSMessageDialog::show(Qt::WindowFlags windowFlags, Qt::WindowModality win
             || windowModality == Qt::NonModal) // We can only do modal dialogs
         return false;
 
+    if (!options()->checkBoxLabel().isNull())
+        return false; // Can't support
+
     m_alertController = [[UIAlertController
         alertControllerWithTitle:options()->windowTitle().toNSString()
         message:messageTextPlain().toNSString()
@@ -112,7 +116,18 @@ bool QIOSMessageDialog::show(Qt::WindowFlags windowFlags, Qt::WindowModality win
         [m_alertController addAction:createAction(NoButton)];
     }
 
-    UIWindow *window = parent ? reinterpret_cast<UIView *>(parent->winId()).window : qt_apple_sharedApplication().keyWindow;
+    UIWindow *window = presentationWindow(parent);
+    if (!window)
+        return false;
+
+    if (window.hidden) {
+         // With a window hidden, an attempt to present view controller
+         // below fails with a warning, that a view "is not a part of
+         // any view hierarchy". The UIWindow is initially hidden,
+         // as unhiding it is what hides the splash screen.
+         window.hidden = NO;
+    }
+
     [window.rootViewController presentViewController:m_alertController animated:YES completion:nil];
     return true;
 }