Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: Ibd5caf0448c9eba9251bc9395fe647f1955743f0
This commit is contained in:
Liang Qi
2015-12-15 19:05:02 +01:00
5 changed files with 40 additions and 13 deletions

4
.gitmodules vendored
View File

@@ -190,3 +190,7 @@
url = ../qtquickcontrols2.git
branch = dev
initrepo = true
[submodule "qtpurchasing"]
path = qtpurchasing
url = ../qtpurchasing.git
branch = dev