From 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf Mon Sep 17 00:00:00 2001
From: takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp>
Date: Mon, 2 Nov 2020 11:07:33 +0900
Subject: basesystem-jj recipes

---
 .../qt5/qt3d/0001-Allow-a-tools-only-build.patch   | 27 +++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'external/meta-qt5/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch')

diff --git a/external/meta-qt5/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/external/meta-qt5/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
index 0189a9dc..cc4dd659 100644
--- a/external/meta-qt5/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/external/meta-qt5/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -1,4 +1,4 @@
-From 72d96957995393312ad29920d67fa758d0e53ca5 Mon Sep 17 00:00:00 2001
+From 01c62d4e4bf1034302834fef48a894c6b0ebe147 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Fri, 17 Aug 2018 13:23:58 +0300
 Subject: [PATCH] Allow a tools-only build
@@ -6,20 +6,20 @@ Subject: [PATCH] Allow a tools-only build
 ---
  qt3d.pro                                  | 7 ++++++-
  src/3rdparty/assimp/assimp_dependency.pri | 2 +-
- tools/tools.pro                           | 2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
+ tools/tools.pro                           | 4 ++--
+ 3 files changed, 9 insertions(+), 4 deletions(-)
 
 diff --git a/qt3d.pro b/qt3d.pro
-index 2cc347a1c..81cdeefb0 100644
+index d5dbda4b9..6809470b6 100644
 --- a/qt3d.pro
 +++ b/qt3d.pro
 @@ -1,4 +1,4 @@
--requires(qtConfig(opengl))
-+!tools-only:requires(qtConfig(opengl))
+-qtHaveModule(gui): \
++!tools-only:qtHaveModule(gui): \
+     requires(qtConfig(opengl):!wasm)
  
  CONFIG += examples_need_tools
- load(qt_parts)
-@@ -14,3 +14,8 @@ load(qt_parts)
+@@ -15,3 +15,8 @@ load(qt_parts)
  
  OTHER_FILES += \
      sync.profile
@@ -40,13 +40,18 @@ index 8ba2d9a41..e973d93dd 100644
  } else {
      include(assimp.pri)
 diff --git a/tools/tools.pro b/tools/tools.pro
-index c2f692034..24c49ad5a 100644
+index 3b457ed50..9f5376a0a 100644
 --- a/tools/tools.pro
 +++ b/tools/tools.pro
-@@ -1,5 +1,5 @@
+@@ -1,9 +1,9 @@
  TEMPLATE = subdirs
+ 
+-!qtHaveModule(3dcore): \
++!tools-only:!qtHaveModule(3dcore): \
+     return()
+ 
  QT_FOR_CONFIG += 3dcore-private
--qtConfig(assimp):qtConfig(commandlineparser):!cross_compile: {
+-qtConfig(assimp):qtConfig(commandlineparser): {
 +tools-only|qtConfig(assimp):qtConfig(commandlineparser): {
      SUBDIRS += qgltf
  }
-- 
cgit 1.2.3-korg