diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-31 09:53:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-31 09:53:10 +0200 |
| commit | c80e96bb09ebcf0b031843b58efb4ef037246bf1 (patch) | |
| tree | 717a6bf41b08ff1b3ddb43e9b003fc9b7a40a2e1 /.gitmodules | |
| parent | f05fece2f774137a08a1578ed2499f4890aee799 (diff) | |
| parent | 84a1676ed6566d548f2cce35ced9c0524f41c349 (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Conflicts:
.gitmodules
Change-Id: Ic9c8564006c2722f925700f09ff42da3e912f580
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 2b223c8a..743e2e8e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,7 @@ path = qtscript url = ../qtscript.git branch = 5.6 - status = addon + status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative @@ -144,7 +144,7 @@ path = qtwayland url = ../qtwayland.git branch = 5.6 - status = preview + status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats path = qt3d @@ -219,7 +219,7 @@ path = qtenginio url = ../qtenginio.git branch = 5.6 - status = obsolete + status = deprecated [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative |