summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-24 19:36:47 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-24 19:46:00 +0100
commit6aa97038e26bab96455b2fc3febc5d358a5e7599 (patch)
tree0e1177bcd4b133e39fe1a439b9cfbc718942f127
parent225c4a724e058851c9a2b4ffe6032b6f84cfd90c (diff)
parent6fd334e59cab4ae0cd0c587fe2f64cf302ba1f21 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: sync.profile Change-Id: Ie87e9b6e2d976b6ed433a8d747a83cf0d27bed95
-rw-r--r--sync.profile13
1 files changed, 0 insertions, 13 deletions
diff --git a/sync.profile b/sync.profile
index 213a944e..41eae2b2 100644
--- a/sync.profile
+++ b/sync.profile
@@ -4,16 +4,3 @@
);
%moduleheaders = ( # restrict the module headers to those found in relative path
);
-# 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" => "",
- "qtxmlpatterns" => "",
- "qtdeclarative" => "",
- "qtgraphicaleffects" => ""
-);