summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-02-19 15:54:18 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-02-19 15:54:18 +0100
commitcafb5c371ff31c5d55617c7e4013215415cee214 (patch)
tree6067db7730359d626dec62c13e8d3b624ceaf532
parent550bf471b01b95098a376ec8534e0646f3f0c71f (diff)
parentf05e6784c7667d476b9ccde4be3568cfd6b2022d (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts: .qmake.conf Change-Id: I3b738037529d1e99e595d7893d47352b7b5de1a0
-rw-r--r--src/webview/qquickviewcontroller.cpp1
-rw-r--r--src/webview/qwebview_winrt.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/webview/qquickviewcontroller.cpp b/src/webview/qquickviewcontroller.cpp
index 89f3f99..f6dae31 100644
--- a/src/webview/qquickviewcontroller.cpp
+++ b/src/webview/qquickviewcontroller.cpp
@@ -95,6 +95,7 @@ void QQuickViewChangeListener::itemGeometryChanged(QQuickItem *, const QRectF &,
void QQuickViewChangeListener::itemChildRemoved(QQuickItem *item, QQuickItem *child)
{
+ Q_UNUSED(item)
Q_ASSERT(item != m_item);
const bool ancestor = isAncestor(child);
diff --git a/src/webview/qwebview_winrt.cpp b/src/webview/qwebview_winrt.cpp
index e5543b8..eb78439 100644
--- a/src/webview/qwebview_winrt.cpp
+++ b/src/webview/qwebview_winrt.cpp
@@ -665,6 +665,7 @@ HRESULT QWinRTWebViewPrivate::onNavigationCompleted(IWebView *, IWebViewNavigati
const QString errorString = webErrorStatusString(errorStatus);
emit loadingChanged(QWebViewLoadRequestPrivate(url, status, errorString));
+ emit titleChanged(title());
emit loadProgressChanged(100);
return S_OK;
}