diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-25 08:04:58 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-25 08:34:20 +0100 |
| commit | 1d6b43c44b68d1983a77a7368c6cfff78f2d4cd0 (patch) | |
| tree | b5d752c2ded6c4ee2c3e32cee7aabe88bb881a44 /sync.profile | |
| parent | 716ca066c7f07371aaae79029c60996bc6e57118 (diff) | |
| parent | 2e52c497f205460ee61e6f6940849c057adc7adb (diff) | |
| download | qtquickcontrols-1d6b43c44b68d1983a77a7368c6cfff78f2d4cd0.tar.gz | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Conflicts:
src/qtdesktop/CheckBox.qml
src/qtdesktop/doc/qtdesktopcomponents.qdocconf
Change-Id: Ic3799053a18b0a3f97e251354ad8433438b08a7a
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 9692e548..59c2fb57 100644 --- a/sync.profile +++ b/sync.profile @@ -9,8 +9,8 @@ # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) # %dependencies = ( - "qtbase" => "refs/heads/dev", - "qtdeclarative" => "refs/heads/dev", - "qtjsbackend" => "refs/heads/dev", - "qtxmlpatterns" => "refs/heads/dev", + "qtbase" => "refs/heads/stable", + "qtdeclarative" => "refs/heads/stable", + "qtjsbackend" => "refs/heads/stable", + "qtxmlpatterns" => "refs/heads/stable", ); |