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.12' into 5.13.1

Browse Source 
Conflicts:
	.gitmodules
	coin/platform_configs/qtbase.yaml

Change-Id: I964ffb430436c62ad675fabc853642800499ade3
This commit is contained in:
Liang Qi
2019-08-08 15:31:47 +02:00
parent f511a2d74f 42bfac5bf8
commit 03d4a54e34
4 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -265,7 +265,7 @@
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.13.1
status = ignore
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative