Merge branch 'stable' into dev

Conflicts:
	Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

Change-Id: Iaa6209d0d611d18b8c916bcd165c8bf5b7441b7b

1 files changed, 12 insertions, 0 deletions

diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
index 053987b3e..2806ce5d5 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
@@ -498,6 +498,7 @@ void QQuickWebViewPrivate::didRelaunchProcess()
 
     updateViewportSize();
     updateUserScripts();
+    updateSchemeDelegates();
 
     emit q->experimental()->didRelaunchProcess();
 }
@@ -796,6 +797,17 @@ void QQuickWebViewPrivate::updateUserScripts()
     webPageProxy->setUserScripts(scripts);
 }
 
+void QQuickWebViewPrivate::updateSchemeDelegates()
+{
+    webPageProxy->registerApplicationScheme(ASCIILiteral("qrc"));
+
+    QQmlListProperty<QQuickUrlSchemeDelegate> schemes = experimental->schemeDelegates();
+    for (int i = 0, numSchemes = experimental->schemeDelegates_Count(&schemes); i < numSchemes; ++i) {
+        QQuickUrlSchemeDelegate* scheme = experimental->schemeDelegates_At(&schemes, i);
+        webPageProxy->registerApplicationScheme(scheme->scheme());
+    }
+}
+
 QPointF QQuickWebViewPrivate::contentPos() const
 {
     Q_Q(const QQuickWebView);