Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/sql/drivers/sqlite/qsql_sqlite.cpp

Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd

1 files changed, 19 insertions, 0 deletions

diff --git a/src/plugins/platforms/ios/qiosservices.mm b/src/plugins/platforms/ios/qiosservices.mm
index 32203aeb71..0ac6c590ca 100644
--- a/src/plugins/platforms/ios/qiosservices.mm
+++ b/src/plugins/platforms/ios/qiosservices.mm
@@ -42,6 +42,7 @@
 #include "qiosservices.h"
 
 #include <QtCore/qurl.h>
+#include <QtGui/qdesktopservices.h>
 
 #import <UIKit/UIApplication.h>
 
@@ -49,6 +50,9 @@ QT_BEGIN_NAMESPACE
 
 bool QIOSServices::openUrl(const QUrl &url)
 {
+    if (url == m_handlingUrl)
+        return false;
+
     if (url.scheme().isEmpty())
         return openDocument(url);
 
@@ -66,4 +70,19 @@ bool QIOSServices::openDocument(const QUrl &url)
     return QPlatformServices::openDocument(url);
 }
 
+/* Callback from iOS that the application should handle a URL */
+bool QIOSServices::handleUrl(const QUrl &url)
+{
+    QUrl previouslyHandling = m_handlingUrl;
+    m_handlingUrl = url;
+
+    // FIXME: Add platform services callback from QDesktopServices::setUrlHandler
+    // so that we can warn the user if calling setUrlHandler without also setting
+    // up the matching keys in the Info.plist file (CFBundleURLTypes and friends).
+    bool couldHandle = QDesktopServices::openUrl(url);
+
+    m_handlingUrl = previouslyHandling;
+    return couldHandle;
+}
+
 QT_END_NAMESPACE