diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-18 07:59:41 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-18 07:59:41 +0200 |
| commit | 5e94bc83118a89dff17db97dc360d9ab5e46f64f (patch) | |
| tree | 2bb03b6d1919f6f666cfcae7e7956f283a5b6d55 /src | |
| parent | f2370c0d09998f382364a9a58932cf717c28a764 (diff) | |
| parent | 47031c68b872718de834656601edd0f8f1931fa7 (diff) | |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Change-Id: I3d5e806345abd81fe91919bb4deecdac725c341f
Diffstat (limited to 'src')
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 2 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 013d1b76695db496d13da4d69e526ce67a9a6bc +Subproject 19e3d1d3af80efee4377a4e5fcb9c214dba5be4 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); } }; |