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

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

Browse Source 
Change-Id: I6c3472a0a6c7f1da8e7320cab5cc9b098bd574ba
This commit is contained in:
Liang Qi
2018-08-31 16:32:13 +02:00
parent 90e3bb68e6 2e6a5787ef
commit 5024bd5725
28 changed files with 386 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -11,7 +11,7 @@
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg qtxmlpatterns
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
branch = dev
@@ -45,6 +45,7 @@
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = dev