diff options
Diffstat (limited to 'recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch')
| -rw-r--r-- | recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | 17 |
1 files changed, 10 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 05a86a70..774d66f7 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,8 +1,10 @@ -From 1e64f9b509e6794c6f01e62443e93f771ac2a65c Mon Sep 17 00:00:00 2001 +From 4cd75323c448db3dd06a0f0f70ec4d8f9ae3ad2c 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 +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- qt3d.pro | 7 ++++++- src/3rdparty/assimp/assimp_dependency.pri | 2 +- @@ -10,7 +12,7 @@ Subject: [PATCH] Allow a tools-only build 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/qt3d.pro b/qt3d.pro -index d5dbda4..6809470 100644 +index c5232e116..cf5345352 100644 --- a/qt3d.pro +++ b/qt3d.pro @@ -1,4 +1,4 @@ @@ -19,17 +21,18 @@ index d5dbda4..6809470 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 + SUBDIRS = sub_tools +} +\ No newline at end of file diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri -index 8ba2d9a..e973d93 100644 +index 8ba2d9a41..e973d93dd 100644 --- a/src/3rdparty/assimp/assimp_dependency.pri +++ b/src/3rdparty/assimp/assimp_dependency.pri @@ -1,5 +1,5 @@ @@ -40,7 +43,7 @@ index 8ba2d9a..e973d93 100644 } else { include(assimp.pri) diff --git a/tools/tools.pro b/tools/tools.pro -index 3b457ed..9f5376a 100644 +index 3b457ed50..9f5376a0a 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,9 +1,9 @@ |