summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt3d
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qt3d')
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch8
-rw-r--r--recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch2
2 files changed, 5 insertions, 5 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 66c80173..37093983 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 05562960b7a3ed7753c9a39a7032fea873fc4098 Mon Sep 17 00:00:00 2001 1From cab5a0bcf52370fede85ee02896ce1a2979d6631 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
@@ -40,12 +40,12 @@ index 8ba2d9a..e973d93 100644
40 } else { 40 } else {
41 include(assimp.pri) 41 include(assimp.pri)
42diff --git a/tools/tools.pro b/tools/tools.pro 42diff --git a/tools/tools.pro b/tools/tools.pro
43index 8e973ae..ad51db5 100644 43index 64f2b9f..d108e7f 100644
44--- a/tools/tools.pro 44--- a/tools/tools.pro
45+++ b/tools/tools.pro 45+++ b/tools/tools.pro
46@@ -1,4 +1,4 @@ 46@@ -1,4 +1,4 @@
47 TEMPLATE = subdirs 47 TEMPLATE = subdirs
48 QT_FOR_CONFIG += 3dcore-private 48 QT_FOR_CONFIG += 3dcore-private
49-!android:qtConfig(assimp):qtConfig(commandlineparser): \ 49-qtConfig(assimp):qtConfig(commandlineparser): \
50+!android:tools-only|qtConfig(assimp):qtConfig(commandlineparser): \ 50+tools-only|qtConfig(assimp):qtConfig(commandlineparser): \
51 SUBDIRS += qgltf 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 3357fa3e..68b0f332 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 fc23039612ab9aed4f994b4390016e71ceee8165 Mon Sep 17 00:00:00 2001 1From d6e714f9c2b1e5ed238084e254268d70d2093ae1 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.