diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-05 13:51:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-05 11:56:43 +0000 |
| commit | 5bd6aa7c26be9af9ed1940c3567e25b14f914bb0 (patch) | |
| tree | 211d1ee49121c76046281f110ccd2a4bb9977954 | |
| parent | 30d78feb0cf7ba96bf29e5b7f89bf6baf4965765 (diff) | |
Include qtimageformats and qtnetworkauth in wip/cmake
Change-Id: I9f451ef08663a635ca05427735a31da895a68607
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | .gitmodules | 8 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtnetworkauth | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index 2efd083d..640f73ff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -143,8 +143,8 @@ depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev - status = ignore + branch = wip/cmake + status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects @@ -290,8 +290,8 @@ depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev - status = ignore + branch = wip/cmake + status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative diff --git a/qtimageformats b/qtimageformats -Subproject 147cd191d68a248f257317f5403fe0b3b9d6cbf +Subproject 9cf98b08da79980017b1663f3603149f39a2151 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 3e927d64266aa51d1f4f853f3c905ffd4576b6b +Subproject 94cbd067349e315e8d1f8798228ade0b77a65b7 |