summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2021-01-18 12:24:26 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2021-01-18 13:25:00 +0200
commit5d4a3edca84eab4453165f7d90d786a2b914f58e (patch)
tree692ef762299a16c424f0350c21a2789e41582f8b
parentb19f7ca18a337341bb449ae020164115a91c1e1e (diff)
Update qt/qtquick3d-assimp submodule
Fixes: QTBUG-89433 Pick-to: dev Change-Id: Iec372c94b541f871f3ed78843656c2dfa1a1f613 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
-rw-r--r--.gitmodules1
m---------src/3rdparty/assimp/src0
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