Merge branch '5.6' into 5.7

Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9

1 files changed, 3 insertions, 1 deletions

diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index 4503520eb..f3ac0f7ca 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -89,10 +89,12 @@ class RenderProcessObserverQt : public content::RenderProcessObserver {
 public:
     void WebKitInitialized() override
     {
-        // mark qrc as a secure scheme (avoids deprecation warnings)
         // Can only be done after blink is initialized.
         blink::WebString qrcScheme(base::ASCIIToUTF16(kQrcSchemeQt));
+        // mark qrc as a secure scheme (avoids deprecation warnings)
         blink::WebSecurityPolicy::registerURLSchemeAsSecure(qrcScheme);
+        // mark qrc as a local scheme (allows local access to qrc)
+        blink::WebSecurityPolicy::registerURLSchemeAsLocal(qrcScheme);
     }
 };