qt3d: update patch to apply

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2020-03-26 23:05:53 +01:00
parent a38953a6e9
commit df67d5a7f0
2 changed files with 7 additions and 7 deletions

View File

@@ -1,4 +1,4 @@
From 01c62d4e4bf1034302834fef48a894c6b0ebe147 Mon Sep 17 00:00:00 2001
From 938dbe06407be1e918331cb629879b0bdf7d9eb4 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Allow a tools-only build
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/qt3d.pro b/qt3d.pro
index d5dbda4b9..6809470b6 100644
index c5232e116..cf5345352 100644
--- a/qt3d.pro
+++ b/qt3d.pro
@@ -1,4 +1,4 @@
@@ -19,10 +19,10 @@ index d5dbda4b9..6809470b6 100644
requires(qtConfig(opengl):!wasm)
CONFIG += examples_need_tools
@@ -15,3 +15,8 @@ load(qt_parts)
@@ -16,3 +16,8 @@ load(qt_parts)
OTHER_FILES += \
sync.profile
sync.profile \
.qmake.conf
+
+tools-only {
+ sub_tools.depends -= sub_src

View File

@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
DEPENDS_class-target += "qtdeclarative qt3d-native"
# Patches from https://github.com/meta-qt5/qt3d/commits/b5.14
# 5.14.meta-qt5.1
# Patches from https://github.com/meta-qt5/qt3d/commits/b5.15
# 5.15.meta-qt5.1
SRC_URI += " \
file://0001-Allow-a-tools-only-build.patch \
"