diff options
author | Liang Qi <liang.qi@qt.io> | 2017-01-25 09:48:58 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 09:48:58 +0100 |
commit | a3a229bd2ace8fc4f874304e60cf1cb74f294d71 (patch) | |
tree | 6acea4ad4993e16a3ca0470f540ff590ba298537 | |
parent | 574f6c73a967ec9ec497534e35f442ef327c25b3 (diff) | |
parent | 254be077bc20f4eb68cc4cc3e44eab8d20cd4f55 (diff) |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I8032d1bba8276f49077f01d6f06520cdd9ebb5ba
-rw-r--r-- | sync.profile | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sync.profile b/sync.profile index 65c0ab5..6d035bc 100644 --- a/sync.profile +++ b/sync.profile @@ -1,12 +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" => "", - "qtdeclarative" => "", - "qtxmlpatterns" => "", +%modules = ( # path to module name map ); |