mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-30 18:27:11 +08:00
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts: coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml Change-Id: Ic4ed934ea7015dc66472ab2f9dd45844b25522b8
This commit is contained in:
4
.gitmodules
vendored
4
.gitmodules
vendored
@@ -143,7 +143,7 @@
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = dev
|
||||
status = addon
|
||||
status = essential
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
@@ -284,7 +284,7 @@
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = dev
|
||||
status = addon
|
||||
status = ignore
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
|
||||
Reference in New Issue
Block a user