diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2016-05-04 17:01:45 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@theqtcompany.com> | 2016-05-10 09:35:12 +0000 |
| commit | b96784cc6677bef9bd32afb7ca7e6e713114ee9f (patch) | |
| tree | 2234c73fe489ce61a7987c3b58abc0845a790459 /src | |
| parent | a757568022ebefd0d83f69a20c09dcc8bdb98136 (diff) | |
Revert marking qrc: as a local scheme
It was causing a regression that broke applications that embedded
JavaScript in qrc files and accessed them from other embedded
JavaScript files. This is e.g. a typical pattern for applications
that used QtWebChannel.
This partially reverts 29f9a2fb68568208a70ba9efef0e455b50a4d3e3
Task-number: QTBUG-53108
Change-Id: I8b26395d84258b6d9aca8e0c5f07d4435617f44d
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index e53076525..3886e54a0 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -73,8 +73,6 @@ public: 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); } }; |