diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-05 09:52:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-05 09:52:18 +0200 |
| commit | 5758a88e591d805c11cb9fb8bd6ff8455ccddddf (patch) | |
| tree | b9f86316a259780d39ca4f6d278ff314628af5cc /.gitmodules | |
| parent | a550ad21bf4aadbb43763b63bab4513c40dc8b0d (diff) | |
| parent | e80d89059ce16f376fbaeb934a1cd3b54bcbc6bb (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.gitmodules
Change-Id: If63e4f4f7d9a7ddba01d4e621fe6bfbc60838d26
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index cf3d5a67..49b048ed 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,7 @@ path = qtscript url = ../qtscript.git branch = 5.7 - status = addon + status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative @@ -220,7 +220,7 @@ path = qtenginio url = ../qtenginio.git branch = 5.7 - status = obsolete + status = deprecated [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative |