diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:54:42 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-26 21:09:54 +0100 |
commit | 77567bad82081ffb166578bdeac52fb1f2dce464 (patch) | |
tree | 149e70126cd4ae0e676feee3097596547c0952be /sync.profile | |
parent | 24a1c04b69cec2d7aff70b4dc7e44a19313c62bf (diff) | |
parent | 310271a4aa43aad9d8ca09154e5af5b1d6338fc4 (diff) | |
download | qtmultimedia-77567bad82081ffb166578bdeac52fb1f2dce464.tar.gz |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/plugins/qnx/qnx.pro
sync.profile
Change-Id: I353a44578276264a9ffb80820d8c5a0babfa1638
Diffstat (limited to 'sync.profile')
-rw-r--r-- | sync.profile | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sync.profile b/sync.profile index 7d02c1519..4623849da 100644 --- a/sync.profile +++ b/sync.profile @@ -17,15 +17,3 @@ "qtmultimediadefs.h" => "QtMultimedia/qtmultimediaglobal.h" }, ); -# 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" => "", - "qtxmlpatterns" => "", - "qtdeclarative" => "", -); |