lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I63778fc883354b724fcf91d92ee6d80b7cb481aa
This commit is contained in:
Liang Qi
2018-04-10 15:04:06 +02:00
parent 5abe434755 1616d89eea
commit 9b584a8117
11 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@@ -249,8 +249,8 @@
branch = dev
status = essential
[submodule "qtpurchasing"]
depends = qtbase qtandroidextras
recommends = qtdeclarative
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtpurchasing
url = ../qtpurchasing.git
branch = dev