Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: I8032d1bba8276f49077f01d6f06520cdd9ebb5ba

1 files changed, 1 insertions, 11 deletions

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