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:
Liang Qi
2019-08-06 11:46:15 +02:00
134 changed files with 4641 additions and 2126 deletions

4
.gitmodules vendored
View File

@@ -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