11 files changed, 273 insertions, 130 deletions

diff --git a/src/plugins/platforms/ios/ios.pro b/src/plugins/platforms/ios/ios.pro
index bf7849b740..b1075d3c0f 100644
--- a/src/plugins/platforms/ios/ios.pro
+++ b/src/plugins/platforms/ios/ios.pro
@@ -6,7 +6,7 @@ PLUGIN_CLASS_NAME = QIOSIntegrationPlugin
 load(qt_plugin)
 
 QT += core-private gui-private platformsupport-private
-LIBS += -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary
+LIBS += -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary -framework AudioToolbox
 
 OBJECTIVE_SOURCES = \
     plugin.mm \
@@ -30,7 +30,8 @@ OBJECTIVE_SOURCES = \
     qiostextresponder.mm \
     qiosmenu.mm \
     qiosfileengineassetslibrary.mm \
-    qiosfiledialog.mm
+    qiosfiledialog.mm \
+    qiosmessagedialog.mm
 
 HEADERS = \
     qiosintegration.h \
@@ -54,7 +55,8 @@ HEADERS = \
     qiosmenu.h \
     qiosfileenginefactory.h \
     qiosfileengineassetslibrary.h \
-    qiosfiledialog.h
+    qiosfiledialog.h \
+    qiosmessagedialog.h
 
 OTHER_FILES = \
     quiview_textinput.mm \
diff --git a/src/plugins/platforms/ios/qiosbackingstore.h b/src/plugins/platforms/ios/qiosbackingstore.h
index 5d2ae429f1..387a286447 100644
--- a/src/plugins/platforms/ios/qiosbackingstore.h
+++ b/src/plugins/platforms/ios/qiosbackingstore.h
@@ -36,34 +36,31 @@
 
 #include <qpa/qplatformbackingstore.h>
 
+#include <QtPlatformSupport/private/qrasterbackingstore_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QOpenGLPaintDevice;
-class QOpenGLFramebufferObject;
-class QOffscreenSurface;
 
-class QIOSBackingStore : public QPlatformBackingStore
+class QIOSBackingStore : public QRasterBackingStore
 {
 public:
     QIOSBackingStore(QWindow *window);
     ~QIOSBackingStore();
 
-    QPaintDevice *paintDevice();
+    QPaintDevice *paintDevice() Q_DECL_OVERRIDE;
 
-    void beginPaint(const QRegion &);
-    void endPaint();
+    void beginPaint(const QRegion &) Q_DECL_OVERRIDE;
+    void endPaint() Q_DECL_OVERRIDE;
 
-    void flush(QWindow *window, const QRegion &region, const QPoint &offset);
-    void resize(const QSize &size, const QRegion &staticContents);
-    GLuint toTexture(const QRegion &dirtyRegion, QSize *textureSize, TextureFlags *flags) const;
+    void flush(QWindow *window, const QRegion &region, const QPoint &offset) Q_DECL_OVERRIDE;
+    void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE;
 
     void makeCurrent();
 
 private:
     QOpenGLContext *m_context;
-    QOpenGLPaintDevice *m_device;
-    QOpenGLFramebufferObject *m_fbo;
-    QOffscreenSurface *m_surface;
+    QOpenGLPaintDevice *m_glDevice;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/ios/qiosbackingstore.mm b/src/plugins/platforms/ios/qiosbackingstore.mm
index 875d06dc80..f408c13af3 100644
--- a/src/plugins/platforms/ios/qiosbackingstore.mm
+++ b/src/plugins/platforms/ios/qiosbackingstore.mm
@@ -38,6 +38,7 @@
 #include <QtGui/QOpenGLPaintDevice>
 #include <QtGui/QOpenGLFramebufferObject>
 #include <QtGui/QOffscreenSurface>
+#include <QtGui/qpainter.h>
 #include <QtGui/private/qwindow_p.h>
 
 #include <QtDebug>
@@ -58,13 +59,12 @@ void QIOSPaintDevice::ensureActiveTarget()
 }
 
 QIOSBackingStore::QIOSBackingStore(QWindow *window)
-    : QPlatformBackingStore(window)
+    : QRasterBackingStore(window)
     , m_context(new QOpenGLContext)
-    , m_device(0)
-    , m_fbo(0)
-    , m_surface(0)
+    , m_glDevice(nullptr)
 {
     QSurfaceFormat fmt = window->requestedFormat();
+
     // Due to sharing QIOSContext redirects our makeCurrent on window() attempts to
     // the global share context. Hence it is essential to have a compatible format.
     fmt.setDepthBufferSize(QSurfaceFormat::defaultFormat().depthBufferSize());
@@ -73,8 +73,10 @@ QIOSBackingStore::QIOSBackingStore(QWindow *window)
     if (fmt.depthBufferSize() == 0)
         qWarning("No depth in default format, expect rendering errors");
 
+    // We use the surface both for raster operations and for GL drawing (when
+    // we blit the raster image), so the type needs to cover both use cases.
     if (window->surfaceType() == QSurface::RasterSurface)
-        window->setSurfaceType(QSurface::OpenGLSurface);
+        window->setSurfaceType(QSurface::RasterGLSurface);
 
     m_context->setFormat(fmt);
     m_context->setScreen(window->screen());
@@ -85,75 +87,44 @@ QIOSBackingStore::QIOSBackingStore(QWindow *window)
 
 QIOSBackingStore::~QIOSBackingStore()
 {
-    delete m_fbo;
-    delete m_surface;
     delete m_context;
-    delete m_device;
+    delete m_glDevice;
 }
 
 void QIOSBackingStore::makeCurrent()
 {
-    QSurface *surface = m_surface ? m_surface : static_cast<QSurface *>(window());
-    if (!m_context->makeCurrent(surface))
+    if (!m_context->makeCurrent(window()))
         qWarning("QIOSBackingStore: makeCurrent() failed");
-    if (m_fbo)
-        m_fbo->bind();
 }
 
-void QIOSBackingStore::beginPaint(const QRegion &)
+void QIOSBackingStore::beginPaint(const QRegion &region)
 {
-    if (qt_window_private(window())->compositing) {
-        if (!m_fbo) {
-            delete m_device;
-            m_device = 0;
-        }
-        if (!m_surface) {
-            m_surface = new QOffscreenSurface;
-            m_surface->setFormat(m_context->format());
-            m_surface->create();
-        }
-        if (!m_context->makeCurrent(m_surface))
-            qWarning("QIOSBackingStore: Failed to make offscreen surface current");
-        const QSize size = window()->size() * window()->devicePixelRatio();
-        if (m_fbo && m_fbo->size() != size) {
-            delete m_fbo;
-            m_fbo = 0;
-        }
-        if (!m_fbo)
-            m_fbo = new QOpenGLFramebufferObject(size, QOpenGLFramebufferObject::CombinedDepthStencil);
-    } else if (m_fbo) {
-        delete m_fbo;
-        m_fbo = 0;
-        delete m_surface;
-        m_surface = 0;
-        delete m_device;
-        m_device = 0;
-    }
-
     makeCurrent();
 
-    if (!m_device)
-        m_device = new QIOSPaintDevice(this);
+    if (!m_glDevice)
+        m_glDevice = new QIOSPaintDevice(this);
+
+    if (window()->surfaceType() == QSurface::RasterGLSurface)
+        QRasterBackingStore::beginPaint(region);
 }
 
 void QIOSBackingStore::endPaint()
 {
-    if (m_fbo) {
-        m_fbo->release();
-        glFlush();
-    }
 }
 
 QPaintDevice *QIOSBackingStore::paintDevice()
 {
-    Q_ASSERT(m_device);
+    Q_ASSERT(m_glDevice);
 
     // Keep paint device size and device pixel ratio in sync with window
     qreal devicePixelRatio = window()->devicePixelRatio();
-    m_device->setSize(window()->size() * devicePixelRatio);
-    m_device->setDevicePixelRatio(devicePixelRatio);
+    m_glDevice->setSize(window()->size() * devicePixelRatio);
+    m_glDevice->setDevicePixelRatio(devicePixelRatio);
 
-    return m_device;
+    if (window()->surfaceType() == QSurface::RasterGLSurface)
+        return QRasterBackingStore::paintDevice();
+    else
+        return m_glDevice;
 }
 
 void QIOSBackingStore::flush(QWindow *window, const QRegion &region, const QPoint &offset)
@@ -171,6 +142,11 @@ void QIOSBackingStore::flush(QWindow *window, const QRegion &region, const QPoin
         return;
     }
 
+    if (window->surfaceType() == QSurface::RasterGLSurface) {
+        QPainter painter(m_glDevice);
+        painter.drawImage(QPoint(), m_image);
+    }
+
     m_context->makeCurrent(window);
     m_context->swapBuffers(window);
 }
@@ -179,31 +155,20 @@ void QIOSBackingStore::resize(const QSize &size, const QRegion &staticContents)
 {
     Q_UNUSED(staticContents);
 
-    // Resizing the backing store would in our case mean resizing the QWindow,
-    // as we cheat and use an QOpenGLPaintDevice that we target at the window.
-    // That's probably not what the user intended, so we ignore resizes of the
-    // backing store and always keep the paint device's size in sync with the
-    // window size in beginPaint().
+    if (window()->surfaceType() == QSurface::OpenGLSurface) {
+        // Resizing the backing store would in this case mean resizing the QWindow,
+        // as we use an QOpenGLPaintDevice that we target at the window. That's
+        // probably not what the user intended, so we ignore resizes of the backing
+        // store and always keep the paint device's size in sync with the window
+        // size in beginPaint().
 
-    if (size != window()->size() && !window()->inherits("QWidgetWindow"))
-        qWarning() << "QIOSBackingStore needs to have the same size as its window";
-}
-
-GLuint QIOSBackingStore::toTexture(const QRegion &dirtyRegion, QSize *textureSize, TextureFlags *flags) const
-{
-    Q_ASSERT(qt_window_private(window())->compositing);
-    Q_UNUSED(dirtyRegion);
-
-    if (flags)
-        *flags = TextureFlip;
+        if (size != window()->size() && !window()->inherits("QWidgetWindow"))
+            qWarning() << "QIOSBackingStore needs to have the same size as its window";
 
-    if (!m_fbo)
-        return 0;
-
-    if (textureSize)
-        *textureSize = m_fbo->size();
+        return;
+    }
 
-    return m_fbo->texture();
+    QRasterBackingStore::resize(size, staticContents);
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/ios/qioseventdispatcher.mm b/src/plugins/platforms/ios/qioseventdispatcher.mm
index 0e9f176487..e1c6071c38 100644
--- a/src/plugins/platforms/ios/qioseventdispatcher.mm
+++ b/src/plugins/platforms/ios/qioseventdispatcher.mm
@@ -129,7 +129,7 @@ namespace
 
             // Which we verify, just in case
             struct rlimit stackLimit = {0, 0};
-            if (getrlimit(RLIMIT_STACK, &stackLimit) == 0 && stackSize > stackLimit.rlim_cur)
+            if (Q_UNLIKELY(getrlimit(RLIMIT_STACK, &stackLimit) == 0 && stackSize > stackLimit.rlim_cur))
                 qFatal("Unexpectedly exceeded stack limit");
 
             return stackSize;
@@ -250,7 +250,7 @@ static void __attribute__((noinline, noreturn)) user_main_trampoline()
         unsigned int bufferSize = [arg lengthOfBytesUsingEncoding:cStringEncoding] + 1;
         argv[i] = reinterpret_cast<char *>(malloc(bufferSize));
 
-        if (![arg getCString:argv[i] maxLength:bufferSize encoding:cStringEncoding])
+        if (Q_UNLIKELY(![arg getCString:argv[i] maxLength:bufferSize encoding:cStringEncoding]))
             qFatal("Could not convert argv[%d] to C string", i);
     }
 
diff --git a/src/plugins/platforms/ios/qiosintegration.h b/src/plugins/platforms/ios/qiosintegration.h
index 7d23fe1d62..e670d83a8d 100644
--- a/src/plugins/platforms/ios/qiosintegration.h
+++ b/src/plugins/platforms/ios/qiosintegration.h
@@ -82,6 +82,8 @@ public:
     void addScreen(QPlatformScreen *screen) { screenAdded(screen); }
     void destroyScreen(QPlatformScreen *screen) { QPlatformIntegration::destroyScreen(screen); }
 
+    void beep() const Q_DECL_OVERRIDE;
+
     static QIOSIntegration *instance();
 
     // -- QPlatformNativeInterface --
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm
index 85b5c477cc..21248ddb86 100644
--- a/src/plugins/platforms/ios/qiosintegration.mm
+++ b/src/plugins/platforms/ios/qiosintegration.mm
@@ -53,6 +53,8 @@
 #include <QtPlatformSupport/private/qmacmime_p.h>
 #include <QDir>
 
+#import <AudioToolbox/AudioServices.h>
+
 #include <QtDebug>
 
 QT_BEGIN_NAMESPACE
@@ -70,7 +72,7 @@ QIOSIntegration::QIOSIntegration()
     , m_accessibility(0)
     , m_debugWindowManagement(false)
 {
-    if (![UIApplication sharedApplication]) {
+    if (Q_UNLIKELY(![UIApplication sharedApplication])) {
         qFatal("Error: You are creating QApplication before calling UIApplicationMain.\n" \
                "If you are writing a native iOS application, and only want to use Qt for\n" \
                "parts of the application, a good place to create QApplication is from within\n" \
@@ -268,6 +270,13 @@ QPlatformNativeInterface *QIOSIntegration::nativeInterface() const
     return const_cast<QIOSIntegration *>(this);
 }
 
+void QIOSIntegration::beep() const
+{
+#if !TARGET_IPHONE_SIMULATOR
+    AudioServicesPlayAlertSound(kSystemSoundID_Vibrate);
+#endif
+}
+
 // ---------------------------------------------------------
 
 void *QIOSIntegration::nativeResourceForWindow(const QByteArray &resource, QWindow *window)
diff --git a/src/plugins/platforms/ios/qiosmenu.h b/src/plugins/platforms/ios/qiosmenu.h
index ec23b55507..3beb58b503 100644
--- a/src/plugins/platforms/ios/qiosmenu.h
+++ b/src/plugins/platforms/ios/qiosmenu.h
@@ -74,9 +74,6 @@ public:
     bool m_separator;
     QIOSMenu *m_menu;
     QKeySequence m_shortcut;
-
-private:
-    QString removeMnemonics(const QString &original);
 };
 
 typedef QList<QIOSMenuItem *> QIOSMenuItemList;
diff --git a/src/plugins/platforms/ios/qiosmenu.mm b/src/plugins/platforms/ios/qiosmenu.mm
index 612f8c43a2..5f9346816a 100644
--- a/src/plugins/platforms/ios/qiosmenu.mm
+++ b/src/plugins/platforms/ios/qiosmenu.mm
@@ -33,6 +33,7 @@
 
 #include <qglobal.h>
 #include <qguiapplication.h>
+#include <qpa/qplatformtheme.h>
 
 #include "qiosglobal.h"
 #include "qiosmenu.h"
@@ -271,7 +272,7 @@ quintptr QIOSMenuItem::tag() const
 
 void QIOSMenuItem::setText(const QString &text)
 {
-    m_text = removeMnemonics(text);
+    m_text = QPlatformTheme::removeMnemonics(text);
 }
 
 void QIOSMenuItem::setMenu(QPlatformMenu *menu)
@@ -304,41 +305,6 @@ void QIOSMenuItem::setEnabled(bool enabled)
     m_enabled = enabled;
 }
 
-QString QIOSMenuItem::removeMnemonics(const QString &original)
-{
-    // Copied from qcocoahelpers
-    QString returnText(original.size(), 0);
-    int finalDest = 0;
-    int currPos = 0;
-    int l = original.length();
-    while (l) {
-        if (original.at(currPos) == QLatin1Char('&')
-            && (l == 1 || original.at(currPos + 1) != QLatin1Char('&'))) {
-            ++currPos;
-            --l;
-            if (l == 0)
-                break;
-        } else if (original.at(currPos) == QLatin1Char('(') && l >= 4 &&
-                   original.at(currPos + 1) == QLatin1Char('&') &&
-                   original.at(currPos + 2) != QLatin1Char('&') &&
-                   original.at(currPos + 3) == QLatin1Char(')')) {
-            /* remove mnemonics its format is "\s*(&X)" */
-            int n = 0;
-            while (finalDest > n && returnText.at(finalDest - n - 1).isSpace())
-                ++n;
-            finalDest -= n;
-            currPos += 4;
-            l -= 4;
-            continue;
-        }
-        returnText[finalDest] = original.at(currPos);
-        ++currPos;
-        ++finalDest;
-        --l;
-    }
-    returnText.truncate(finalDest);
-    return returnText;
-}
 
 QIOSMenu::QIOSMenu()
     : QPlatformMenu()
diff --git a/src/plugins/platforms/ios/qiosmessagedialog.h b/src/plugins/platforms/ios/qiosmessagedialog.h
new file mode 100644
index 0000000000..a9bd42324e
--- /dev/null
+++ b/src/plugins/platforms/ios/qiosmessagedialog.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QIOSMESSAGEDIALOG_H
+#define QIOSMESSAGEDIALOG_H
+
+#include <QtCore/qeventloop.h>
+#include <qpa/qplatformdialoghelper.h>
+
+QT_BEGIN_NAMESPACE
+
+Q_FORWARD_DECLARE_OBJC_CLASS(UIAlertController);
+Q_FORWARD_DECLARE_OBJC_CLASS(UIAlertAction);
+
+class QIOSMessageDialog : public QPlatformMessageDialogHelper
+{
+public:
+    QIOSMessageDialog();
+    ~QIOSMessageDialog();
+
+    void exec() Q_DECL_OVERRIDE;
+    bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) Q_DECL_OVERRIDE;
+    void hide() Q_DECL_OVERRIDE;
+
+private:
+    QEventLoop m_eventLoop;
+    UIAlertController *m_alertController;
+    QString messageTextPlain();
+    UIAlertAction *createAction(StandardButton button);
+};
+
+QT_END_NAMESPACE
+
+#endif // QIOSMESSAGEDIALOG_H
+
diff --git a/src/plugins/platforms/ios/qiosmessagedialog.mm b/src/plugins/platforms/ios/qiosmessagedialog.mm
new file mode 100644
index 0000000000..39f7d4b1cd
--- /dev/null
+++ b/src/plugins/platforms/ios/qiosmessagedialog.mm
@@ -0,0 +1,135 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#import <UIKit/UIKit.h>
+
+#include <QtGui/qwindow.h>
+#include <QtGui/private/qguiapplication_p.h>
+#include <qpa/qplatformtheme.h>
+
+#include "qiosglobal.h"
+#include "quiview.h"
+#include "qiosmessagedialog.h"
+
+QIOSMessageDialog::QIOSMessageDialog()
+    : m_alertController(Q_NULLPTR)
+{
+}
+
+QIOSMessageDialog::~QIOSMessageDialog()
+{
+    hide();
+}
+
+inline QString QIOSMessageDialog::messageTextPlain()
+{
+    // Concatenate text fragments, and remove HTML tags
+    const QSharedPointer<QMessageDialogOptions> &opt = options();
+    const QString &lineShift = QStringLiteral("\n\n");
+    const QString &informativeText = opt->informativeText();
+    const QString &detailedText = opt->detailedText();
+
+    QString text = opt->text();
+    if (!informativeText.isEmpty())
+        text += lineShift + informativeText;
+    if (!detailedText.isEmpty())
+        text += lineShift + detailedText;
+
+    text.replace(QLatin1String("<p>"), QStringLiteral("\n"), Qt::CaseInsensitive);
+    text.remove(QRegularExpression(QStringLiteral("<[^>]*>")));
+
+    return text;
+}
+
+inline UIAlertAction *QIOSMessageDialog::createAction(StandardButton button)
+{
+    const StandardButton labelButton = button == NoButton ? Ok : button;
+    const QString &standardLabel = QGuiApplicationPrivate::platformTheme()->standardButtonText(labelButton);
+    const QString &label = QPlatformTheme::removeMnemonics(standardLabel);
+
+    UIAlertActionStyle style = UIAlertActionStyleDefault;
+    if (button == Cancel)
+        style = UIAlertActionStyleCancel;
+    else if (button == Discard)
+        style = UIAlertActionStyleDestructive;
+
+    return [UIAlertAction actionWithTitle:label.toNSString() style:style handler:^(UIAlertAction *) {
+        hide();
+        if (button == NoButton)
+            emit reject();
+        else
+            emit clicked(button, buttonRole(button));
+    }];
+}
+
+void QIOSMessageDialog::exec()
+{
+    m_eventLoop.exec(QEventLoop::DialogExec);
+}
+
+bool QIOSMessageDialog::show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent)
+{
+    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
+            || QSysInfo::MacintoshVersion < QSysInfo::MV_IOS_8_0) // API limitation
+        return false;
+
+    m_alertController = [[UIAlertController
+        alertControllerWithTitle:options()->windowTitle().toNSString()
+        message:messageTextPlain().toNSString()
+        preferredStyle:UIAlertControllerStyleAlert] retain];
+
+    if (StandardButtons buttons = options()->standardButtons()) {
+        for (int i = FirstButton; i < LastButton; i<<=1) {
+            if (i & buttons)
+                [m_alertController addAction:createAction(StandardButton(i))];
+        }
+    } else {
+        // We need at least one button to allow the user close the dialog
+        [m_alertController addAction:createAction(NoButton)];
+    }
+
+    UIWindow *window = parent ? reinterpret_cast<UIView *>(parent->winId()).window : [UIApplication sharedApplication].keyWindow;
+    [window.rootViewController presentViewController:m_alertController animated:YES completion:nil];
+    return true;
+}
+
+void QIOSMessageDialog::hide()
+{
+    m_eventLoop.exit();
+    [m_alertController dismissViewControllerAnimated:YES completion:nil];
+    [m_alertController release];
+    m_alertController = Q_NULLPTR;
+}
diff --git a/src/plugins/platforms/ios/qiostheme.mm b/src/plugins/platforms/ios/qiostheme.mm
index bc40069670..dccacb2c0e 100644
--- a/src/plugins/platforms/ios/qiostheme.mm
+++ b/src/plugins/platforms/ios/qiostheme.mm
@@ -47,6 +47,7 @@
 
 #include "qiosmenu.h"
 #include "qiosfiledialog.h"
+#include "qiosmessagedialog.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -85,6 +86,7 @@ bool QIOSTheme::usePlatformNativeDialog(QPlatformTheme::DialogType type) const
 {
     switch (type) {
     case FileDialog:
+    case MessageDialog:
         return true;
     default:
         return false;
@@ -97,6 +99,9 @@ QPlatformDialogHelper *QIOSTheme::createPlatformDialogHelper(QPlatformTheme::Dia
     case FileDialog:
         return new QIOSFileDialog();
         break;
+    case MessageDialog:
+        return new QIOSMessageDialog();
+        break;
     default:
         return 0;
     }