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

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

Browse Source 
Change-Id: I370742cb0aa2b362dded7131adb08bc7af44a02b
This commit is contained in:
Liang Qi
2017-03-28 10:20:15 +02:00
parent 1da7bdd25e bee0c1b12f
commit 37e3da674c
10 changed files with 28 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -93,7 +93,7 @@
priority = 50
[submodule "qtlocation"]
depends = qtbase
recommends = qtdeclarative qtquickcontrols qtserialport
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation
url = ../qtlocation.git
branch = dev