From df53ff5f85f69932538cc1c571b86b0c2a885a10 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Fri, 12 Jun 2020 13:22:23 +0100 Subject: [PATCH] Add Qt3D back to addon list and update submodule Getting ready for Qt 6 inclusion. Change-Id: I5e823ba5c9c0e42cb9afc3ce32d68fa44322f21a Reviewed-by: Alexandru Croitor --- .gitmodules | 4 ++-- qt3d | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index ac4fa05f..11c3ded9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -127,11 +127,11 @@ status = addon [submodule "qt3d"] depends = qtbase - recommends = qtdeclarative qtimageformats qtgamepad qtshadertools + recommends = qtdeclarative qtshadertools path = qt3d url = ../qt3d.git branch = dev - status = ignore + status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats diff --git a/qt3d b/qt3d index c2ea752f..eefd4511 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c2ea752f684290d156c500c6a7174fe3f27fa086 +Subproject commit eefd4511d5d59045d3ac079b319e01dfca2334a1