diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-01-18 12:24:26 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-01-18 13:51:45 +0000 |
| commit | 8329ade04f39fd181d003b3192c9e91ce9a13c38 (patch) | |
| tree | ade21cd0e7a3646bb18b16d37c51498d197b8548 | |
| parent | 9c6563c780eef3890c83b82ebbb0ebf271fb6897 (diff) | |
Update qt/qtquick3d-assimp submodule
Fixes: QTBUG-89433
Change-Id: Iec372c94b541f871f3ed78843656c2dfa1a1f613
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
(cherry picked from commit 5d4a3edca84eab4453165f7d90d786a2b914f58e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | .gitmodules | 1 | ||||
| m--------- | src/3rdparty/assimp/src | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 46804f477..0e87e838d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "src/3rdparty/assimp/src"] path = src/3rdparty/assimp/src url = ../qtquick3d-assimp.git + branch = qt6_assimp diff --git a/src/3rdparty/assimp/src b/src/3rdparty/assimp/src -Subproject 8f0c6b04b2257a520aaab38421b2e090204b69d +Subproject d71020db155e9b2d4dba5562c980c016cde77f4 |