diff options
author | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:54:26 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:54:26 +0100 |
commit | 5ecce026f65b2fb320379e49e70f772ad2bbba69 (patch) | |
tree | 5c75bbacbcd55d9c4dc7265ed9cb2fc4f869765d /sync.profile | |
parent | b45429fd7eeaf598d78f76a670a892c7d0d02f11 (diff) | |
parent | 3cb215e9b988795d6222c9dac38e1a12d00ba838 (diff) | |
download | qtx11extras-5ecce026f65b2fb320379e49e70f772ad2bbba69.tar.gz |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I1adbe081b5d636690616959bbab32890a9374ac3
Diffstat (limited to 'sync.profile')
-rw-r--r-- | sync.profile | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sync.profile b/sync.profile index 29a59d7..64f9e74 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" => "", -); |