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

Conflicts:
	src/plugins/imageformats/webp/qwebphandler.cpp

Change-Id: I494e140819746c83e586bea72d8b02a7d245d970

1 files changed, 1 insertions, 9 deletions

diff --git a/sync.profile b/sync.profile
index 3fad8a6..6d035bc 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,10 +1,2 @@
-# 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" => "",
+%modules = ( # path to module name map
 );