diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 09:05:49 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-11 15:33:49 +0000 |
| commit | 22a550303618202135e58f5673e7b8935d578687 (patch) | |
| tree | 560918164edd7b76a2a8b6246f6dbca0ee69cf9a /src/core/renderer/content_renderer_client_qt.cpp | |
| parent | f8ed4ca51333157170f0fc94e2deff0d91cf4833 (diff) | |
| parent | 7978feadee937299798372bced1680f52b4b1842 (diff) | |
Merge "Merge branch '5.6' into 5.7" into refs/staging/5.7v5.7.0-beta1
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); } }; |