summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt3d
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-06-09 09:34:09 +0300
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-20 19:30:05 +0200
commit969f1f80bf255498abbec6886d443670c20a79c8 (patch)
tree45a65f19da61868c2fe71669fb4b7d29b374edac /recipes-qt/qt5/qt3d
parent648f7b0a2eb202d4378ce50ae566b6ca450dd010 (diff)
downloadmeta-qt5-969f1f80bf255498abbec6886d443670c20a79c8.tar.gz
Upgrade to Qt 5.9.0
* adapt QtWebEngine recipe to use GN instead of GYP * add QtRemoteObjects and QtWebView as a new Qt modules * update available QtBase configure arguments * remove obsolete patches * patch all .pc files to remove build paths * include generated QML cache files in packages * the patch "configure paths for target qmake properly" could not be applied anymore and support must be done differently * QtWebEngine now requires gcc-multilib to be installed on the host system, because the host tools are built to the same bitness as the target (arm -> x86, aarch64 -> x86-64) * refresh the patches to match with b5.9* branches on: https://github.com/meta-qt5/qtbase https://github.com/meta-qt5/qtwebengine and 56-based branch on https://github.com/meta-qt5/qtwebengine-chromium Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qt3d')
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch15
-rw-r--r--recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch56
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 @@
1From 22ccc94b5501509b516fce17195a598d04dcc2f3 Mon Sep 17 00:00:00 2001 1From dd0f3fefeeefb31ec8cf2417bd3f447f7b9c25c6 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com> 2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 10 Feb 2016 09:02:09 +0200 3Date: Wed, 10 Feb 2016 09:02:09 +0200
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
@@ -6,7 +6,8 @@ Subject: [PATCH] Allow a tools-only build
6--- 6---
7 qt3d.pro | 7 ++++++- 7 qt3d.pro | 7 ++++++-
8 src/3rdparty/assimp/assimp_dependency.pri | 2 +- 8 src/3rdparty/assimp/assimp_dependency.pri | 2 +-
9 2 files changed, 7 insertions(+), 2 deletions(-) 9 tools/tools.pro | 2 +-
10 3 files changed, 8 insertions(+), 3 deletions(-)
10 11
11diff --git a/qt3d.pro b/qt3d.pro 12diff --git a/qt3d.pro b/qt3d.pro
12index 2cc347a1c..81cdeefb0 100644 13index 2cc347a1c..81cdeefb0 100644
@@ -38,3 +39,13 @@ index 8ba2d9a41..e973d93dd 100644
38 QMAKE_USE_PRIVATE += assimp 39 QMAKE_USE_PRIVATE += assimp
39 } else { 40 } else {
40 include(assimp.pri) 41 include(assimp.pri)
42diff --git a/tools/tools.pro b/tools/tools.pro
43index 8e973aecb..ad51db585 100644
44--- a/tools/tools.pro
45+++ b/tools/tools.pro
46@@ -1,4 +1,4 @@
47 TEMPLATE = subdirs
48 QT_FOR_CONFIG += 3dcore-private
49-!android:qtConfig(assimp):qtConfig(commandlineparser): \
50+!android:tools-only|qtConfig(assimp):qtConfig(commandlineparser): \
51 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 @@
1From bc5ef10fc6f71cb340ad339bc43f6ce48adb1f59 Mon Sep 17 00:00:00 2001 1From ec40913bc563e3cb0abc1965ce457d3a2fe663b3 Mon Sep 17 00:00:00 2001
2From: Kim Kulling <kim.kulling@googlemail.com> 2From: Kim Kulling <kim.kulling@googlemail.com>
3Date: Mon, 7 Nov 2016 17:19:49 +0100 3Date: Mon, 7 Nov 2016 17:19:49 +0100
4Subject: [PATCH] Fix BlenderDNA for clang cross compiler. 4Subject: [PATCH] Fix BlenderDNA for clang cross compiler.
@@ -9,36 +9,36 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9 1 file changed, 8 insertions(+), 8 deletions(-) 9 1 file changed, 8 insertions(+), 8 deletions(-)
10 10
11diff --git a/src/3rdparty/assimp/code/BlenderDNA.cpp b/src/3rdparty/assimp/code/BlenderDNA.cpp 11diff --git a/src/3rdparty/assimp/code/BlenderDNA.cpp b/src/3rdparty/assimp/code/BlenderDNA.cpp
12index b380fbe8d..3cc27dff1 100644 12index 18ec9f2b4..5b0b2090f 100644
13--- a/src/3rdparty/assimp/code/BlenderDNA.cpp 13--- a/src/3rdparty/assimp/code/BlenderDNA.cpp
14+++ b/src/3rdparty/assimp/code/BlenderDNA.cpp 14+++ b/src/3rdparty/assimp/code/BlenderDNA.cpp
15@@ -56,10 +56,10 @@ using namespace Assimp::Formatter; 15@@ -55,10 +55,10 @@ using namespace Assimp::Formatter;
16 #define for_each BOOST_FOREACH 16
17 bool match4(StreamReaderAny& stream, const char* string) { 17 bool match4(StreamReaderAny& stream, const char* string) {
18 char tmp[] = { 18 char tmp[] = {
19- (stream).GetI1(), 19- (stream).GetI1(),
20- (stream).GetI1(), 20- (stream).GetI1(),
21- (stream).GetI1(), 21- (stream).GetI1(),
22- (stream).GetI1() 22- (stream).GetI1()
23+ (const char)(stream).GetI1(), 23+ (const char)(stream).GetI1(),
24+ (const char)(stream).GetI1(), 24+ (const char)(stream).GetI1(),
25+ (const char)(stream).GetI1(), 25+ (const char)(stream).GetI1(),
26+ (const char)(stream).GetI1() 26+ (const char)(stream).GetI1()
27 }; 27 };
28 return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]); 28 return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]);
29 } 29 }
30@@ -344,10 +344,10 @@ void SectionParser :: Next() 30@@ -345,10 +345,10 @@ void SectionParser :: Next()
31 stream.SetCurrentPos(current.start + current.size); 31 stream.SetCurrentPos(current.start + current.size);
32 32
33 const char tmp[] = { 33 const char tmp[] = {
34- stream.GetI1(), 34- stream.GetI1(),
35- stream.GetI1(), 35- stream.GetI1(),
36- stream.GetI1(), 36- stream.GetI1(),
37- stream.GetI1() 37- stream.GetI1()
38+ (const char)stream.GetI1(), 38+ (const char)stream.GetI1(),
39+ (const char)stream.GetI1(), 39+ (const char)stream.GetI1(),
40+ (const char)stream.GetI1(), 40+ (const char)stream.GetI1(),
41+ (const char)stream.GetI1() 41+ (const char)stream.GetI1()
42 }; 42 };
43 current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1); 43 current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1);
44 44