diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-03 07:31:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-03 07:31:53 +0100 |
| commit | b045cf0ab9756a67a5a1037c231199ee9bf2d074 (patch) | |
| tree | 43831df602905b64552cf31a233127bed9904fc8 /src/webengine | |
| parent | 0bbaf0d5d7b2d406eda57d40370b00fb79cc0aeb (diff) | |
| parent | 7f7af6290a63bdab76855da5866881c8a53f045c (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/3rdparty
Change-Id: Ie6b1922db2269e0e0561022162228a7c8609c9ba
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/api/qquickwebenginefaviconprovider.cpp | 6 | ||||
| -rw-r--r-- | src/webengine/webengine.pro | 2 |
2 files changed, 6 insertions, 2 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; } diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro index 4b2170cbc..24fa2d9d8 100644 --- a/src/webengine/webengine.pro +++ b/src/webengine/webengine.pro @@ -1,5 +1,5 @@ include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) -QT_FOR_CONFIG += webengine-private +QT_FOR_CONFIG += webengine webengine-private TARGET = QtWebEngine |