diff options
Diffstat (limited to 'recipes-qt/qt5/qt3d')
| -rw-r--r-- | recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | 15 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch | 56 |
2 files changed, 41 insertions, 30 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 ba4e2d01..8cf1f501 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 22ccc94b5501509b516fce17195a598d04dcc2f3 Mon Sep 17 00:00:00 2001 +From dd0f3fefeeefb31ec8cf2417bd3f447f7b9c25c6 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 @@ -6,7 +6,8 @@ Subject: [PATCH] Allow a tools-only build --- qt3d.pro | 7 ++++++- src/3rdparty/assimp/assimp_dependency.pri | 2 +- - 2 files changed, 7 insertions(+), 2 deletions(-) + tools/tools.pro | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/qt3d.pro b/qt3d.pro index 2cc347a1c..81cdeefb0 100644 @@ -38,3 +39,13 @@ index 8ba2d9a41..e973d93dd 100644 QMAKE_USE_PRIVATE += assimp } else { include(assimp.pri) +diff --git a/tools/tools.pro b/tools/tools.pro +index 8e973aecb..ad51db585 100644 +--- a/tools/tools.pro ++++ b/tools/tools.pro +@@ -1,4 +1,4 @@ + TEMPLATE = subdirs + QT_FOR_CONFIG += 3dcore-private +-!android:qtConfig(assimp):qtConfig(commandlineparser): \ ++!android:tools-only|qtConfig(assimp):qtConfig(commandlineparser): \ + SUBDIRS += qgltf 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 index 95b5479e..eeb402f6 100644 --- 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 @@ -1,4 +1,4 @@ -From bc5ef10fc6f71cb340ad339bc43f6ce48adb1f59 Mon Sep 17 00:00:00 2001 +From ec40913bc563e3cb0abc1965ce457d3a2fe663b3 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. @@ -9,36 +9,36 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/3rdparty/assimp/code/BlenderDNA.cpp b/src/3rdparty/assimp/code/BlenderDNA.cpp -index b380fbe8d..3cc27dff1 100644 +index 18ec9f2b4..5b0b2090f 100644 --- a/src/3rdparty/assimp/code/BlenderDNA.cpp +++ b/src/3rdparty/assimp/code/BlenderDNA.cpp -@@ -56,10 +56,10 @@ using namespace Assimp::Formatter; - #define for_each BOOST_FOREACH +@@ -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]); + 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]); } -@@ -344,10 +344,10 @@ void SectionParser :: Next() - stream.SetCurrentPos(current.start + current.size); +@@ -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); + 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); |