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

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

Browse Source 
Conflicts:
	.gitmodules

Change-Id: I5b4d96eedbbc228d61d7c62ff077c05a4fb70928
This commit is contained in:
Oswald Buddenhagen
2017-05-05 11:22:54 +02:00
parent 8325f2bde9 4f4de8aa16
commit 8d2f6c17f9
19 changed files with 324 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.gitmodules vendored
View File

@@ -146,8 +146,8 @@
branch = 5.9.0
status = addon
[submodule "qt3d"]
depends = qtdeclarative qtimageformats
recommends = qtgamepad
depends = qtdeclarative
recommends = qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
branch = 5.9.0
@@ -295,32 +295,32 @@
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad
url = ../qtgamepad.git
branch = 5.9.0
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml
url = ../qtscxml.git
branch = 5.9.0
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech
url = ../qtspeech.git
branch = 5.9.0
status = preview
[submodule "qtnetworkauth"]
depends = qtbase
recommends = qtwebview
path = qtnetworkauth
url = ../qtnetworkauth
url = ../qtnetworkauth.git
branch = 5.9.0
status = preview
[submodule "qtremoteobjects"]
depends = qtbase
path = qtremoteobjects
url = ../qtremoteobjects
url = ../qtremoteobjects.git
branch = 5.9.0
status = preview