diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-20 12:29:37 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-20 13:20:51 +0000 |
| commit | 658bae2541f3f9dbe9dadf288d967b187521f5b6 (patch) | |
| tree | d026ebc4175e29034684a49e567b0a0f30e11209 | |
| parent | 94fc71997ca8fb94fb1cba6f36eb9a24b6da4464 (diff) | |
Fix favicons with queries or fragments
Set the parts of the URL after the path separately to avoid QUrl
escaping the separators.
Change-Id: I6d2be3e8737bdf6aad01107d68297711d75326d0
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | src/webengine/api/qquickwebenginefaviconprovider.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebenginefaviconprovider.cpp b/src/webengine/api/qquickwebenginefaviconprovider.cpp index b5ad6960a..3255f22be 100644 --- a/src/webengine/api/qquickwebenginefaviconprovider.cpp +++ b/src/webengine/api/qquickwebenginefaviconprovider.cpp @@ -70,7 +70,11 @@ QUrl QQuickWebEngineFaviconProvider::faviconProviderUrl(const QUrl &url) QUrl providerUrl; providerUrl.setScheme(QStringLiteral("image")); providerUrl.setHost(identifier()); - providerUrl.setPath(QStringLiteral("/%1").arg(url.toString())); + providerUrl.setPath(QStringLiteral("/%1").arg(url.toString(QUrl::RemoveQuery | QUrl::RemoveFragment))); + if (url.hasQuery()) + providerUrl.setQuery(url.query(QUrl::FullyDecoded)); + if (url.hasFragment()) + providerUrl.setFragment(url.fragment(QUrl::FullyDecoded)); return providerUrl; } |