diff options
author | Liang Qi <liang.qi@qt.io> | 2017-04-09 09:40:45 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-04-09 09:40:45 +0200 |
commit | 415ea08693115af85a1dc30a4bc6432715a43df0 (patch) | |
tree | 8f15632610e891ad8dff14e6902bda1113445dc2 /.gitmodules | |
parent | 5e30cba1fdadad388f24f07cbeb88172e9155021 (diff) | |
parent | b80fa7bc4cbb74c5ab01186a1cb0392cc7569128 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I88192479624510cb34227f401d9e8b07977f9711
Diffstat (limited to '.gitmodules')
-rw-r--r-- | .gitmodules | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 16393b28..091e2a7c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -238,6 +238,7 @@ [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools + serialize = qtwebkit path = qtwebengine url = ../qtwebengine.git branch = dev |