diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-04-17 09:35:00 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-04-18 06:01:39 +0000 |
commit | d6b6664ef23c38db48e48be36b90a34ae92dc558 (patch) | |
tree | 817b670eddf20ad7d272b1263e4fe471b93f3176 /recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch | |
parent | 93863ffb8e4964391bd95574a2cca7941ef15ff9 (diff) |
qt5: update submodulesv5.11.0-beta4
Update to Qt 5.11.0 Beta4 RC
Task-number: QTBUG-67589
Change-Id: Ic064bbdae4b61ad3ec86edd70e6cb789723eec1b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch')
-rw-r--r-- | recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch deleted file mode 100644 index 3357fa3e..00000000 --- a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch +++ /dev/null @@ -1,44 +0,0 @@ -From fc23039612ab9aed4f994b4390016e71ceee8165 Mon Sep 17 00:00:00 2001 -From: Kim Kulling <kim.kulling@googlemail.com> -Date: Mon, 7 Nov 2016 17:19:49 +0100 -Subject: [PATCH] Fix BlenderDNA for clang cross compiler. - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/3rdparty/assimp/code/BlenderDNA.cpp | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/3rdparty/assimp/code/BlenderDNA.cpp b/src/3rdparty/assimp/code/BlenderDNA.cpp -index 18ec9f2..5b0b209 100644 ---- a/src/3rdparty/assimp/code/BlenderDNA.cpp -+++ b/src/3rdparty/assimp/code/BlenderDNA.cpp -@@ -55,10 +55,10 @@ using namespace Assimp::Formatter; - - bool match4(StreamReaderAny& stream, const char* string) { - char tmp[] = { -- (stream).GetI1(), -- (stream).GetI1(), -- (stream).GetI1(), -- (stream).GetI1() -+ (const char)(stream).GetI1(), -+ (const char)(stream).GetI1(), -+ (const char)(stream).GetI1(), -+ (const char)(stream).GetI1() - }; - return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]); - } -@@ -345,10 +345,10 @@ void SectionParser :: Next() - stream.SetCurrentPos(current.start + current.size); - - const char tmp[] = { -- stream.GetI1(), -- stream.GetI1(), -- stream.GetI1(), -- stream.GetI1() -+ (const char)stream.GetI1(), -+ (const char)stream.GetI1(), -+ (const char)stream.GetI1(), -+ (const char)stream.GetI1() - }; - current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1); - |