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

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

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

Change-Id: I4dee3bb4aab69430fc013ce509e20b7a9b9e4f47
This commit is contained in:
Liang Qi
2017-10-05 12:47:24 +02:00
parent cdab32be23 9a096e6841
commit 1099b1ddce
104 changed files with 1136 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitmodules vendored
View File

@@ -243,6 +243,7 @@
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = dev