diff options
-rw-r--r-- | recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | 10 | ||||
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 4 |
2 files changed, 7 insertions, 7 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 cc4dd659..f7b88cf3 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 @@ | |||
1 | From 01c62d4e4bf1034302834fef48a894c6b0ebe147 Mon Sep 17 00:00:00 2001 | 1 | From 938dbe06407be1e918331cb629879b0bdf7d9eb4 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Fri, 17 Aug 2018 13:23:58 +0300 | 3 | Date: Fri, 17 Aug 2018 13:23:58 +0300 |
4 | Subject: [PATCH] Allow a tools-only build | 4 | Subject: [PATCH] Allow a tools-only build |
@@ -10,7 +10,7 @@ Subject: [PATCH] Allow a tools-only build | |||
10 | 3 files changed, 9 insertions(+), 4 deletions(-) | 10 | 3 files changed, 9 insertions(+), 4 deletions(-) |
11 | 11 | ||
12 | diff --git a/qt3d.pro b/qt3d.pro | 12 | diff --git a/qt3d.pro b/qt3d.pro |
13 | index d5dbda4b9..6809470b6 100644 | 13 | index c5232e116..cf5345352 100644 |
14 | --- a/qt3d.pro | 14 | --- a/qt3d.pro |
15 | +++ b/qt3d.pro | 15 | +++ b/qt3d.pro |
16 | @@ -1,4 +1,4 @@ | 16 | @@ -1,4 +1,4 @@ |
@@ -19,10 +19,10 @@ index d5dbda4b9..6809470b6 100644 | |||
19 | requires(qtConfig(opengl):!wasm) | 19 | requires(qtConfig(opengl):!wasm) |
20 | 20 | ||
21 | CONFIG += examples_need_tools | 21 | CONFIG += examples_need_tools |
22 | @@ -15,3 +15,8 @@ load(qt_parts) | 22 | @@ -16,3 +16,8 @@ load(qt_parts) |
23 | |||
24 | OTHER_FILES += \ | 23 | OTHER_FILES += \ |
25 | sync.profile | 24 | sync.profile \ |
25 | .qmake.conf | ||
26 | + | 26 | + |
27 | +tools-only { | 27 | +tools-only { |
28 | + sub_tools.depends -= sub_src | 28 | + sub_tools.depends -= sub_src |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index e0d6d1dd..8c468285 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = " \ | |||
11 | DEPENDS += "qtbase" | 11 | DEPENDS += "qtbase" |
12 | DEPENDS_class-target += "qtdeclarative qt3d-native" | 12 | DEPENDS_class-target += "qtdeclarative qt3d-native" |
13 | 13 | ||
14 | # Patches from https://github.com/meta-qt5/qt3d/commits/b5.14 | 14 | # Patches from https://github.com/meta-qt5/qt3d/commits/b5.15 |
15 | # 5.14.meta-qt5.1 | 15 | # 5.15.meta-qt5.1 |
16 | SRC_URI += " \ | 16 | SRC_URI += " \ |
17 | file://0001-Allow-a-tools-only-build.patch \ | 17 | file://0001-Allow-a-tools-only-build.patch \ |
18 | " | 18 | " |