summaryrefslogtreecommitdiffstats
path: root/sync.profile
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2016-11-09 10:45:15 +0100
committerMichael BrĂ¼ning <michael.bruning@qt.io>2016-11-09 10:44:18 +0000
commitdd80dd0e4efcdfcc33f71a4f964aa9d2d40c4af0 (patch)
treea28af35f72ddb05ade66551d9196b9f4916cbf50 /sync.profile
parent1666e7bbdc6f9bdcaeb257d4d46e29a3e326a9e0 (diff)
parentff26fa899f095eff9b3265b462e97c7e48ab06f5 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Needed to update QWebEnginePagePrivate to match modified WebContentsAdapter API in 5.7. Conflicts: src/webenginewidgets/api/qwebenginepage.cpp Change-Id: If3da3b4db9dc27e5d6aae1e31a4e7b45c435697e
Diffstat (limited to 'sync.profile')
-rw-r--r--sync.profile16
1 files changed, 0 insertions, 16 deletions
diff --git a/sync.profile b/sync.profile
index e4a88e0c2..4cc549106 100644
--- a/sync.profile
+++ b/sync.profile
@@ -10,19 +10,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)
-#
-%dependencies = (
- "qtbase" => "",
- "qtdeclarative" => "",
- "qtlocation" => "",
- "qttools" => "",
-# FIXME: take examples out into their own module to avoid a potential circular dependency later ?
- "qtquickcontrols" => "",
- "qtwebchannel" => "",
-);