mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-01 03:07:13 +08:00
Merge remote-tracking branch 'origin/5.13' into 5.13.1
Notice - qtvirtualkeyboard and qtwebengine got ignored temporarily due to issues on QEMU. Conflicts: .gitmodules Change-Id: Iefab0fa5172c976ca06b3f33772c4c4bc10763c2
This commit is contained in:
4
.gitmodules
vendored
4
.gitmodules
vendored
@@ -216,7 +216,7 @@
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.13.1
|
||||
status = addon
|
||||
status = ignore
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
@@ -265,7 +265,7 @@
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.13.1
|
||||
status = addon
|
||||
status = ignore
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
|
||||
Reference in New Issue
Block a user