diff options
author | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:01:05 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:01:05 +0100 |
commit | 196097bfc84d297199ea591fc19e714c88796e8e (patch) | |
tree | 44db9b8047021f358a009b1d8662e69711f6b969 /sync.profile | |
parent | 1cbc05a6568db5e0ff094f8e09723c607ade88af (diff) | |
parent | 87d83df5f3fa2a582385e70dc22c4a9789134f99 (diff) | |
download | qtwebchannel-196097bfc84d297199ea591fc19e714c88796e8e.tar.gz |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I601a28bfd7eb92d894295d7b7848b4a80dcc1d5d
Diffstat (limited to 'sync.profile')
-rw-r--r-- | sync.profile | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sync.profile b/sync.profile index 6ffe8c3..8460cb8 100644 --- a/sync.profile +++ b/sync.profile @@ -3,16 +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" => "", - # optional dependencies: - "qtwebsockets" => "", - "qtdeclarative" => "", -); |