diff options
| -rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 2 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebenginetouchhandleprovider.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index 875870e40..ff4f8c642 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -541,7 +541,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame m_viewClient->iconChanged(QUrl()); content::NavigationEntry *entry = web_contents()->GetController().GetActiveEntry(); - int http_statuscode = entry ? http_statuscode = entry->GetHttpStatusCode() : 0; + int http_statuscode = entry ? entry->GetHttpStatusCode() : 0; EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode); } diff --git a/src/webengine/api/qquickwebenginetouchhandleprovider.cpp b/src/webengine/api/qquickwebenginetouchhandleprovider.cpp index 80f4727b6..56162b223 100644 --- a/src/webengine/api/qquickwebenginetouchhandleprovider.cpp +++ b/src/webengine/api/qquickwebenginetouchhandleprovider.cpp @@ -67,7 +67,7 @@ void QQuickWebEngineTouchHandleProvider::init(const QMap<int, QImage> &images) return; } - m_touchHandleMap.unite(images); + m_touchHandleMap.insert(images); } QImage QQuickWebEngineTouchHandleProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize) |