diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-04 22:21:23 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-04 22:21:23 +0100 |
| commit | ad3c5195259321ab8420df0dee1a9b14cfc4811b (patch) | |
| tree | f6dd1fc9f3b0578a261294f43fe7ed477c9108cc /.gitmodules | |
| parent | 111799abf170d4a65358aa84d1f1d9a92bee6350 (diff) | |
| parent | 8de4f42cb62b083cee959ae196eec6c593b3f8ea (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I415772838a8434d00ad4ccebc8b1c4180e85880b
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 6a1e8498..05660dba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -237,7 +237,7 @@ status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel - recommends = qtlocation + recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git branch = 5.9 |