diff options
author | Liang Qi <liang.qi@qt.io> | 2017-01-24 13:36:08 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-01-24 13:36:08 +0100 |
commit | 3f9e924417c13f2026fda503a1620f517370466d (patch) | |
tree | 2ee94771b53dd0d7dcbd7ba098a8b2e58c357eba | |
parent | 3c6d1f97c0b17f572ae569ad56360cca68fe23cb (diff) | |
parent | c9175b821526a94300f16770cadbd88a0f73acd9 (diff) |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I1fea0d1f4b2f99021b94d0922dc1e07bf4d935b1
-rw-r--r-- | sync.profile | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sync.profile b/sync.profile index fdafa78..1912e5b 100644 --- a/sync.profile +++ b/sync.profile @@ -3,13 +3,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" => "", -); |