diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-02 17:47:32 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-02 17:47:32 +0200 |
commit | bcbaa596815caf53c80f4a5220fb008000b3d897 (patch) | |
tree | bf639fe99579d951e85618f3bd0ff71b6b1e974c /sync.profile | |
parent | 6bea7fb2dc597817fde7e16216220d2eacc48509 (diff) | |
parent | a79f70e2dfa1fa3d3a418310c7b8c8bb89c2d3c8 (diff) | |
download | qtwebchannel-bcbaa596815caf53c80f4a5220fb008000b3d897.tar.gz |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ibbab64e34150e1131fadf37f2e84a0a3f618974f
Diffstat (limited to 'sync.profile')
-rw-r--r-- | sync.profile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sync.profile b/sync.profile index 6c0ef84..6ffe8c3 100644 --- a/sync.profile +++ b/sync.profile @@ -11,8 +11,8 @@ # - 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" => "refs/heads/dev", + "qtbase" => "", # optional dependencies: - "qtwebsockets" => "refs/heads/dev", - "qtdeclarative" => "refs/heads/dev", + "qtwebsockets" => "", + "qtdeclarative" => "", ); |