qt5: upgrade to 5.11 beta3+

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

2 files changed, 1 insertions, 45 deletions

diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
index 37093983..30d32b44 100644
--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -1,4 +1,4 @@
-From cab5a0bcf52370fede85ee02896ce1a2979d6631 Mon Sep 17 00:00:00 2001
+From 0fc2916634a213f38b81ae74160136cf384f6166 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@theqtcompany.com>
 Date: Wed, 10 Feb 2016 09:02:09 +0200
 Subject: [PATCH] Allow a tools-only build
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 68b0f332..00000000
--- a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From d6e714f9c2b1e5ed238084e254268d70d2093ae1 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);
-