diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 18:47:33 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-19 18:47:33 +0000 |
| commit | bc317d32a65eb08da7df10bec6417829533cfc3a (patch) | |
| tree | 1f539a4cf4626d7d568f8b234ba8d59bdc8f33e8 /src | |
| parent | 1f2109f95a4714fa9b1e16179c8dba8846ef342e (diff) | |
| parent | 5e94bc83118a89dff17db97dc360d9ab5e46f64f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6.1' into 5.6" into refs/staging/5.6
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); } }; |