diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-26 10:29:43 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-26 10:29:43 +0200 |
| commit | 1f15ce005f9e7649203e0021efe39e29c4554623 (patch) | |
| tree | 948db2faf06056140745d51c740364c018a3f275 /.gitmodules | |
| parent | 613242b2bfd0da4afae134615c18fef76c5b54ac (diff) | |
| parent | 4d6b04db3c1711e5f60b3d2421ed27eb5ffcb85f (diff) | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Conflicts:
.gitmodules
Change-Id: Ifa5edde4cfd68df959fabb6a61595d8c1b28b099
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index a9d23be2..d1a6c721 100644 --- a/.gitmodules +++ b/.gitmodules @@ -68,7 +68,7 @@ url = ../qtrepotools.git branch = master status = essential - qt = false + project = - [submodule "qtwebkit"] depends = qtbase recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns |