diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-06-05 15:08:15 +0200 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2018-07-24 13:36:36 +0000 |
| commit | 092e60c7937f9472414a3f9a74d8489ad6bf128c (patch) | |
| tree | ba7fe225717d7dcfda17dc008a42ca03785787a5 | |
| parent | e1bbcc5262bd6dc83ab335faf86eeaa265842f40 (diff) | |
| download | qtwebengine-chromium-092e60c7937f9472414a3f9a74d8489ad6bf128c.tar.gz | |
Revert "Fix assert on QRC urls"
This reverts commit fd32a073829adda8bd5f695a5968dbb87ab0dceb.
Task-number: QTBUG-62536
Change-Id: If81cb0f59d94f01096b0f9dc970da8da23996612
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/url/origin.cc | 6 | ||||
| -rw-r--r-- | chromium/url/url_constants.cc | 2 | ||||
| -rw-r--r-- | chromium/url/url_constants.h | 2 |
3 files changed, 0 insertions, 10 deletions
diff --git a/chromium/url/origin.cc b/chromium/url/origin.cc index bcf6a01d0f0..3d5e0c519d3 100644 --- a/chromium/url/origin.cc +++ b/chromium/url/origin.cc @@ -84,9 +84,6 @@ std::string Origin::Serialize() const { if (scheme() == kFileScheme) return "file://"; - if (scheme() == kQrcScheme) - return "qrc://"; - return tuple_.Serialize(); } @@ -97,9 +94,6 @@ GURL Origin::GetURL() const { if (scheme() == kFileScheme) return GURL("file:///"); - if (scheme() == kQrcScheme) - return GURL("qrc://"); - GURL tuple_url(tuple_.GetURL()); return tuple_url; diff --git a/chromium/url/url_constants.cc b/chromium/url/url_constants.cc index 0f286227b03..110c6a7b22d 100644 --- a/chromium/url/url_constants.cc +++ b/chromium/url/url_constants.cc @@ -27,8 +27,6 @@ const char kMailToScheme[] = "mailto"; const char kWsScheme[] = "ws"; const char kWssScheme[] = "wss"; -const char kQrcScheme[] = "qrc"; - const char kStandardSchemeSeparator[] = "://"; const size_t kMaxURLChars = 2 * 1024 * 1024; diff --git a/chromium/url/url_constants.h b/chromium/url/url_constants.h index 78168718b8b..e06af29979f 100644 --- a/chromium/url/url_constants.h +++ b/chromium/url/url_constants.h @@ -33,8 +33,6 @@ URL_EXPORT extern const char kMailToScheme[]; URL_EXPORT extern const char kWsScheme[]; URL_EXPORT extern const char kWssScheme[]; -URL_EXPORT extern const char kQrcScheme[]; - // Used to separate a standard scheme and the hostname: "://". URL_EXPORT extern const char kStandardSchemeSeparator[]; |