Merge remote-tracking branch 'origin/5.7' into 5.7.1

Change-Id: I354a221526e9b4d1f2d3b3a4d23fa560fa72fef9
This commit is contained in:
Liang Qi
2016-10-12 10:36:43 +02:00
20 changed files with 177 additions and 8 deletions

2
.gitmodules vendored
View File

@@ -263,7 +263,7 @@
branch = 5.7.1
status = addon
[submodule "qtpurchasing"]
depends = qtbase
depends = qtbase qtandroidextras
recommends = qtdeclarative
path = qtpurchasing
url = ../qtpurchasing.git