mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-07 04:46:06 +08:00
Merge remote-tracking branch 'origin/dev' into wip/cmake
Bringing in new SHA1s, while keeping wip/cmake's own configurations. Intended for Qt6 Installer essentials package creation. Conflicts coin/platform_configs/default.yaml Change-Id: I40e26301cf10c3c7bd8b0b4dc11cc47eedc1700e
This commit is contained in:
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -225,8 +225,8 @@
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
depends = qtdeclarative
|
||||
recommends = qtimageformats qtgraphicaleffects
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = dev
|
||||
@@ -284,7 +284,7 @@
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
|
||||
Reference in New Issue
Block a user