mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Merge remote-tracking branch 'origin/dev' into 5.8
Note that this also contains the adjustment of the branch for the latecomers qtspeech and qtnetworkauth. Change-Id: Ia77eb4d47a6ad66cb35e50ae03af751f46a805a8
This commit is contained in:
11
.gitmodules
vendored
11
.gitmodules
vendored
@@ -308,5 +308,12 @@
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech
|
||||
branch = dev
|
||||
status = ignore
|
||||
branch = 5.8
|
||||
status = preview
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
recommends = qtwebview
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth
|
||||
branch = 5.8
|
||||
status = preview
|
||||
|
||||
1
qtnetworkauth
Submodule
1
qtnetworkauth
Submodule
Submodule qtnetworkauth added at fba638b478
Reference in New Issue
Block a user