diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-18 12:00:07 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-18 12:00:07 +0200 |
| commit | 2068af50ca9eb8895e34cb60f67942e100c60432 (patch) | |
| tree | 31c5f51e2bcb74b660fe4013f29c417e71215012 /.gitmodules | |
| parent | 1d3966833b5f27fb262f2d3727557ef2c8947828 (diff) | |
| parent | 2ebfdb4ca80f6738c2720cb261c19fecd65b8b62 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.gitmodules
qtquickcontrols2
qtwebview
Change-Id: Ic5b78f36511d5e022aacd6ade5d052345bc84d14
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 90a794c1..287f82a4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -57,12 +57,10 @@ path = qtwebkit url = ../qtwebkit.git branch = dev - initrepo = true [submodule "qtwebkit-examples"] path = qtwebkit-examples url = ../qtwebkit-examples.git branch = dev - initrepo = true [submodule "qtqa"] path = qtqa url = ../qtqa.git @@ -118,7 +116,6 @@ path = qtquick1 url = ../qtquick1.git branch = dev - initrepo = true [submodule "qtgraphicaleffects"] path = qtgraphicaleffects url = ../qtgraphicaleffects.git @@ -129,6 +126,10 @@ url = ../qtquickcontrols.git branch = dev initrepo = true +[submodule "qtserialbus"] + path = qtserialbus + url = ../qtserialbus.git + branch = dev [submodule "qtserialport"] path = qtserialport url = ../qtserialport.git @@ -179,3 +180,13 @@ url = ../qtcanvas3d.git branch = dev initrepo = true +[submodule "qtwebview"] + path = qtwebview + url = ../qtwebview.git + branch = dev + initrepo = true +[submodule "qtquickcontrols2"] + path = qtquickcontrols2 + url = ../qtquickcontrols2.git + branch = dev + initrepo = true |