Merge remote-tracking branch 'origin/5.9' into dev

Change-Id: I88192479624510cb34227f401d9e8b07977f9711
This commit is contained in:
Liang Qi
2017-04-09 09:40:45 +02:00
26 changed files with 99 additions and 50 deletions

1
.gitmodules vendored
View File

@@ -238,6 +238,7 @@
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation qttools
serialize = qtwebkit
path = qtwebengine
url = ../qtwebengine.git
branch = dev