diff options
author | Milian Wolff <milian.wolff@kdab.com> | 2014-07-02 16:03:37 +0200 |
---|---|---|
committer | Milian Wolff <milian.wolff@kdab.com> | 2014-07-03 13:44:42 +0200 |
commit | 5418f5795e2fd657efa3ceede749228c1e10d25c (patch) | |
tree | 0d3109f25ab416befbaa44ba26f1380d64b30db6 /sync.profile | |
parent | 3c1884f15ed1120bf36efb918cad0bcb461d5193 (diff) | |
download | qtwebchannel-5418f5795e2fd657efa3ceede749228c1e10d25c.tar.gz |
Add cmake test, adapt test directory layout and point to dev branches.
The auto tests are now located in tests/auto instead of directly in
tests/. This is required to ensure the cmake test is found.
Furthermore, the sync.profile is updated to point to refs/heads/dev,
as we target Qt 5.4 with this new module.
Change-Id: I1e6e99968b7081b5774eaf30319cac1fbaed35c2
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
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 da8a563..5d7cd6b 100644 --- a/sync.profile +++ b/sync.profile @@ -11,10 +11,10 @@ # - 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" => "stable", - "qtwebsockets" => "dev", + "qtbase" => "refs/heads/dev", + "qtwebsockets" => "refs/heads/dev", # optional dependencies: - "qtdeclarative" => "stable", + "qtdeclarative" => "refs/heads/dev", # TODO: disabled for now as it breaks CI builds on OSX # requires changes to qtqa scripts as discussed with sifalt, sahumada, tronical # "qtwebkit" => "", |