diff options
author | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:58:03 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:58:03 +0100 |
commit | 365bfb2ef769241e798b7c222a63ff68348d87c7 (patch) | |
tree | 5cddc0217f1dc9cd0dcf4739eb587e7a7f80207b /sync.profile | |
parent | 40e18a92fe3b704735a1fa1512f5b273dedf9102 (diff) | |
parent | c7d1706b512649b4037421aa8f0c119efd23c93a (diff) | |
download | qttranslations-365bfb2ef769241e798b7c222a63ff68348d87c7.tar.gz |
Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta2v5.9.0-beta1v5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I51d9dc5f0e6536e7ec76098f7b87acda7dc593f1
Diffstat (limited to 'sync.profile')
-rw-r--r-- | sync.profile | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sync.profile b/sync.profile index 12c6fc9..6d035bc 100644 --- a/sync.profile +++ b/sync.profile @@ -1,11 +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" => "", - "qttools" => "", +%modules = ( # path to module name map ); |