Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	.qmake.conf

Change-Id: I1375cf9e30e33aad9bd856fcdca54f1b2c1fef49

2 files changed, 1 insertions, 19 deletions

diff --git a/examples/webkitwidgets/browser/browser.pro b/examples/webkitwidgets/browser/browser.pro
index 97559ed..caca413 100644
--- a/examples/webkitwidgets/browser/browser.pro
+++ b/examples/webkitwidgets/browser/browser.pro
@@ -89,10 +89,6 @@ mac {
     }
 }
 
-wince*: {
-    DEPLOYMENT_PLUGIN += qjpeg qgif
-}
-
 EXAMPLE_FILES = Info_mac.plist browser.icns browser.ico browser.rc
 
 # install
diff --git a/sync.profile b/sync.profile
index fd3db4d..6d035bc 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,16 +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" => "",
-    "qtwebkit" => "",
-    "qtscript" => "",
-    "qtsvg" => "",
-    "qtxmlpatterns" => "",
-    "qtdeclarative" => "",
-    "qttools" => "",
+%modules = ( # path to module name map
 );