diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:01:36 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:53:06 +0200 |
commit | 7978feadee937299798372bced1680f52b4b1842 (patch) | |
tree | bb844daade8c195c0a963f4663c2a0f880bd840a /src/core/renderer/content_renderer_client_qt.cpp | |
parent | 56ceccc4d4ff395983c4a2fbbe12fe8cb591cfb5 (diff) | |
parent | 56955e73d4be21bc3f086d1c805352a96944a25c (diff) |
Merge branch '5.6' into 5.7
Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
Diffstat (limited to 'src/core/renderer/content_renderer_client_qt.cpp')
-rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 4 |
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); } }; |