mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
Remove QNX Windows builds, 0358b6d2
Remove Integrity build temporarily, QTBUG-61702
coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
This commit is contained in:
17
.gitmodules
vendored
17
.gitmodules
vendored
@@ -68,7 +68,7 @@
|
||||
url = ../qtrepotools.git
|
||||
branch = master
|
||||
status = essential
|
||||
qt = false
|
||||
project = -
|
||||
[submodule "qtwebkit"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
|
||||
@@ -146,8 +146,8 @@
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtdeclarative qtimageformats
|
||||
recommends = qtgamepad
|
||||
depends = qtdeclarative
|
||||
recommends = qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = dev
|
||||
@@ -295,33 +295,34 @@
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
recommends = qtwebview
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = dev
|
||||
status = preview
|
||||
[submodule "qtwebglplugin"]
|
||||
|
||||
Reference in New Issue
Block a user