summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
diff options
context:
space:
mode:
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.patch15
1 files changed, 13 insertions, 2 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 ba4e2d01..8cf1f501 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 22ccc94b5501509b516fce17195a598d04dcc2f3 Mon Sep 17 00:00:00 2001 1From dd0f3fefeeefb31ec8cf2417bd3f447f7b9c25c6 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
@@ -6,7 +6,8 @@ Subject: [PATCH] Allow a tools-only build
6--- 6---
7 qt3d.pro | 7 ++++++- 7 qt3d.pro | 7 ++++++-
8 src/3rdparty/assimp/assimp_dependency.pri | 2 +- 8 src/3rdparty/assimp/assimp_dependency.pri | 2 +-
9 2 files changed, 7 insertions(+), 2 deletions(-) 9 tools/tools.pro | 2 +-
10 3 files changed, 8 insertions(+), 3 deletions(-)
10 11
11diff --git a/qt3d.pro b/qt3d.pro 12diff --git a/qt3d.pro b/qt3d.pro
12index 2cc347a1c..81cdeefb0 100644 13index 2cc347a1c..81cdeefb0 100644
@@ -38,3 +39,13 @@ index 8ba2d9a41..e973d93dd 100644
38 QMAKE_USE_PRIVATE += assimp 39 QMAKE_USE_PRIVATE += assimp
39 } else { 40 } else {
40 include(assimp.pri) 41 include(assimp.pri)
42diff --git a/tools/tools.pro b/tools/tools.pro
43index 8e973aecb..ad51db585 100644
44--- a/tools/tools.pro
45+++ b/tools/tools.pro
46@@ -1,4 +1,4 @@
47 TEMPLATE = subdirs
48 QT_FOR_CONFIG += 3dcore-private
49-!android:qtConfig(assimp):qtConfig(commandlineparser): \
50+!android:tools-only|qtConfig(assimp):qtConfig(commandlineparser): \
51 SUBDIRS += qgltf