diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2019-09-23 18:16:53 +0200 |
|---|---|---|
| committer | Szabolcs David <davidsz@inf.u-szeged.hu> | 2019-09-30 13:49:48 +0000 |
| commit | cf7e52018a95f4a73fdb191147c4d5281edb13af (patch) | |
| tree | 97e374da52d2f80bb21a5759f9bb76291cd6330b /src/core | |
| parent | 35b00ef95fe05dbda8af6e35dbefefc0de17a1dd (diff) | |
Support qrc protocol in @match rules of user scripts
Pulls in the following Chromium changes:
7ac85fb4cc6 Fix building with pulseaudio 13
7956dfb8d20 Support qrc protocol in UrlPattern
9af3b1bf632 Fix pressure of tablet events
Task-number: QTBUG-76173
Change-Id: Iffc21ed6eb0a99e2b96780ce4f11629d38f8b47e
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/renderer/user_resource_controller.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp index be5e6f043..2613d262e 100644 --- a/src/core/renderer/user_resource_controller.cpp +++ b/src/core/renderer/user_resource_controller.cpp @@ -71,7 +71,7 @@ static const int afterLoadTimeout = 500; static int validUserScriptSchemes() { - return URLPattern::SCHEME_HTTP | URLPattern::SCHEME_HTTPS | URLPattern::SCHEME_FILE; + return URLPattern::SCHEME_HTTP | URLPattern::SCHEME_HTTPS | URLPattern::SCHEME_FILE | URLPattern::SCHEME_QRC; } static bool regexMatchesURL(const std::string &pat, const GURL &url) { |