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

Change-Id: Ibf285f0d67fc5125c1c7da6dfc5b62b834d34867
This commit is contained in:
Simon Hausmann
2016-09-28 16:40:47 +02:00

2
.gitmodules vendored
View File

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