diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-06-07 13:46:00 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-06-07 13:46:00 +0200 |
| commit | d487c74a7f6a18a106314d3dc58013c6cfc2e1ca (patch) | |
| tree | a061010dd8503d6263b72513a454aa5d2356ac5f /sync.profile | |
| parent | 102bdf35b13f1b60df26052341ebc5a2833518c7 (diff) | |
| parent | 5ae30e1ae8de41478476567148846a80cd508e7b (diff) | |
| download | qtsensors-d487c74a7f6a18a106314d3dc58013c6cfc2e1ca.tar.gz | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I0eaa022110b99fc5bc7cdf6304b5cda3ad3e8f8c
Diffstat (limited to 'sync.profile')
| -rw-r--r-- | sync.profile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sync.profile b/sync.profile index 9aa7357..666e42e 100644 --- a/sync.profile +++ b/sync.profile @@ -4,8 +4,8 @@ %moduleheaders = ( # restrict the module headers to those found in relative path ); %dependencies = ( - "qtbase" => "refs/heads/dev", - "qtxmlpatterns" => "refs/heads/dev", - "qtdeclarative" => "refs/heads/dev", - "qtjsbackend" => "refs/heads/dev", + "qtbase" => "", + "qtxmlpatterns" => "", + "qtdeclarative" => "", + "qtjsbackend" => "", ); |