qt6-qtquick3d/qtquick3d-fix-build-with-gcc11.patch

25 lines
1.1 KiB
Diff
Raw Normal View History

2021-05-07 16:33:04 +00:00
diff --git a/src/3rdparty/assimp/src/code/Common/Importer.cpp b/src/3rdparty/assimp/src/code/Common/Importer.cpp
2021-09-14 07:24:09 +00:00
index a2ad041..6f2438f 100644
2021-05-07 16:33:04 +00:00
--- a/src/3rdparty/assimp/src/code/Common/Importer.cpp
+++ b/src/3rdparty/assimp/src/code/Common/Importer.cpp
@@ -46,6 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assimp/version.h>
#include <assimp/config.h>
#include <assimp/importerdesc.h>
+#include <exception>
2021-09-14 07:24:09 +00:00
2021-05-07 16:33:04 +00:00
// ------------------------------------------------------------------------------------------------
/* Uncomment this line to prevent Assimp from catching unknown exceptions.
diff --git a/src/3rdparty/assimp/src/include/assimp/Importer.hpp b/src/3rdparty/assimp/src/include/assimp/Importer.hpp
2021-09-14 07:24:09 +00:00
index 09b5b68..89eb071 100644
2021-05-07 16:33:04 +00:00
--- a/src/3rdparty/assimp/src/include/assimp/Importer.hpp
+++ b/src/3rdparty/assimp/src/include/assimp/Importer.hpp
@@ -58,6 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2021-09-14 07:24:09 +00:00
2021-05-07 16:33:04 +00:00
// Public ASSIMP data structures
#include <assimp/types.h>
+#include <exception>
2021-09-14 07:24:09 +00:00
#include <exception>