From 61e1c61facaf2cd8194cd9db7413c63c56b2362a Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Fri, 21 Oct 2016 11:05:34 +0200 Subject: qquickwebviewcontroller: don't remove listener from wrong parent QQuickViewChangeListener::itemParentChanged is called for parent changes done to any of the items we listen to up the parent chain. But as it stood, we would always remove the change listener from m_item->parentItem(), even if the changed item was higher up in the hierarchy. We would therefore wrongly miss any later changes done to m_item->parentItem(). A bug from this could be seen when pushing an item containing a webview to a stackview, since then, several parent changes would occur. [ChangeLog][General] Fixed missing geometry update bug when a webview changed anchestor (e.g. when pushing it onto a StackView). Task-number: QTBUG-54128 Change-Id: Iff00a0029dd713306db7e39db8c92672a6b379c7 Reviewed-by: Christian Stromme --- src/webview/qquickviewcontroller.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/webview/qquickviewcontroller.cpp b/src/webview/qquickviewcontroller.cpp index ab9e254..56b169b 100644 --- a/src/webview/qquickviewcontroller.cpp +++ b/src/webview/qquickviewcontroller.cpp @@ -109,9 +109,9 @@ void QQuickViewChangeListener::itemChildRemoved(QQuickItem *item, QQuickItem *ch removeAncestorListeners(item, changeMask); } -void QQuickViewChangeListener::itemParentChanged(QQuickItem * /*item*/, QQuickItem *newParent) +void QQuickViewChangeListener::itemParentChanged(QQuickItem *item, QQuickItem *newParent) { - removeAncestorListeners(m_item->parentItem(), changeMask); + removeAncestorListeners(item->parentItem(), changeMask); // Adds this as a listener for newParent and its ancestors. addAncestorListeners(newParent, changeMask); } -- cgit v1.2.3 From c98c779c6474af2f7c347957c6eac4f5e217b988 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 3 Nov 2016 18:26:58 +0100 Subject: remove dependencies from sync.profile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the CI obtains them from the qt5 super repo nowadays. Change-Id: Ibb84dc3a77982a0728586fb52ee48b60c9a6f13e Reviewed-by: Jędrzej Nowacki --- sync.profile | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/sync.profile b/sync.profile index d35d109..91bb6a1 100644 --- a/sync.profile +++ b/sync.profile @@ -3,15 +3,3 @@ ); %moduleheaders = ( # restrict the module headers to those found in relative path ); -# Module dependencies. -# Every module that is required to build this module should have one entry. -# Each of the module version specifiers can take one of the following values: -# - A specific Git revision. -# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) -# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) -# -%dependencies = ( - "qtbase" => "", - "qtdeclarative" => "", - "qtwebengine" => "", -); -- cgit v1.2.3