lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 09:46:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I4060b0ddeb5a77c40b31e1ce1dafd2e878b48e12
This commit is contained in:
Liang Qi
2016-09-30 09:27:59 +02:00
parent 1148171a5d 6fabd34960
commit a5b6125466
10 changed files with 119 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

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