From bad80f375645b758770d01ba65947981cc062715 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 8 Feb 2016 14:56:47 +0100 Subject: Bump version Change-Id: Ia9859403986c3aeb30de0dd3df00f6b4b119ff26 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 775d98c..b642527 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION=5.6.0 +MODULE_VERSION = 5.6.1 -- cgit v1.2.3 From af5591458ea7a6da6b6fedefc3685433d23f7462 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Wed, 17 Feb 2016 08:45:15 +0100 Subject: Fix warning in release mode Change-Id: Iab424566018aaeac1f26d3802f79c1d7b83bad06 Reviewed-by: Christian Stromme --- src/webview/qquickviewcontroller.cpp | 1 + 1 file changed, 1 insertion(+) 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); -- cgit v1.2.3 From f05e6784c7667d476b9ccde4be3568cfd6b2022d Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 17 Feb 2016 12:06:29 +0100 Subject: winrt: Emit the titleChanged() signal when appropriate Change-Id: Iafc4f49a0e7a5aee6aef0622142271000b8f82e8 Reviewed-by: Maurice Kalinowski --- src/webview/qwebview_winrt.cpp | 1 + 1 file changed, 1 insertion(+) 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; } -- cgit v1.2.3