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

Conflicts:
	.qmake.conf
	src/activeqt/control/qaxserverbase.cpp

Change-Id: Ic47ed12f7acf788b923571d1e3515ececd986a19

1 files changed, 0 insertions, 10 deletions

diff --git a/sync.profile b/sync.profile
index 78706bf..15b0fdf 100644
--- a/sync.profile
+++ b/sync.profile
@@ -5,13 +5,3 @@
 );
 %classnames = (
 );
-# 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" => "",
-);