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/dev' into wip/cmake

Browse Source 
Conflicts:
	.gitmodules
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/platform_configs/qtbase.txt

Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
This commit is contained in:
Liang Qi
2019-05-03 10:10:23 +02:00
parent 38b6cbfd42 577d01e9df
commit ff8220f9f6
104 changed files with 574 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -1,7 +1,7 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = dev
branch = wip/cmake
status = essential
[submodule "qtsvg"]
depends = qtbase