Merge remote-tracking branch 'origin/5.6' into 5.75.7

Change-Id: Idef61cdb74accb33ea55e23d33b4713977fd8861

2 files changed, 2 insertions, 14 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);
 }
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" => "",
-);