mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-17 09:46:08 +08:00
Merge remote-tracking branch 'origin/5.9' into dev
This change also integrated latest dev branch of qtremoteobjects
and qtwebengine.
Conflicts:
.gitmodules
qtremoteobjects
qtwebengine
Change-Id: Ic6f97f43c55bdca5d8ac0481f3bb8a73429657b9
This commit is contained in:
16
.gitmodules
vendored
16
.gitmodules
vendored
@@ -11,7 +11,7 @@
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtxmlpatterns
|
||||
recommends = qtsvg qtxmlpatterns
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = dev
|
||||
@@ -100,7 +100,7 @@
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtsvg
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = dev
|
||||
@@ -160,7 +160,7 @@
|
||||
status = addon
|
||||
[submodule "qtquick1"]
|
||||
depends = qtscript
|
||||
recommends = qtxmlpatterns
|
||||
recommends = qtsvg qtxmlpatterns
|
||||
path = qtquick1
|
||||
url = ../qtquick1.git
|
||||
branch = dev
|
||||
@@ -237,7 +237,7 @@
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtquickcontrols qtwebchannel
|
||||
recommends = qtlocation
|
||||
recommends = qtlocation qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = dev
|
||||
@@ -296,7 +296,7 @@
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad
|
||||
branch = dev
|
||||
status = preview
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
@@ -317,3 +317,9 @@
|
||||
url = ../qtnetworkauth
|
||||
branch = dev
|
||||
status = preview
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects
|
||||
branch = dev
|
||||
status = preview
|
||||
|
||||
Reference in New Issue
Block a user