1From 4cd75323c448db3dd06a0f0f70ec4d8f9ae3ad2c Mon Sep 17 00:00:00 2001 2From: Samuli Piippo <samuli.piippo@qt.io> 3Date: Fri, 17 Aug 2018 13:23:58 +0300 4Subject: [PATCH] Allow a tools-only build 5 6Upstream-Status: Pending 7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 8--- 9 qt3d.pro | 7 ++++++- 10 src/3rdparty/assimp/assimp_dependency.pri | 2 +- 11 tools/tools.pro | 4 ++-- 12 3 files changed, 9 insertions(+), 4 deletions(-) 13 14diff --git a/qt3d.pro b/qt3d.pro 15index c5232e116..cf5345352 100644 16--- a/qt3d.pro 17+++ b/qt3d.pro 18@@ -1,4 +1,4 @@ 19-qtHaveModule(gui): \ 20+!tools-only:qtHaveModule(gui): \ 21 requires(qtConfig(opengl):!wasm) 22 23 CONFIG += examples_need_tools 24@@ -16,3 +16,8 @@ load(qt_parts) 25 OTHER_FILES += \ 26 sync.profile \ 27 .qmake.conf 28+ 29+tools-only { 30+ sub_tools.depends -= sub_src 31+ SUBDIRS = sub_tools 32+} 33\ No newline at end of file 34diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri 35index 8ba2d9a41..e973d93dd 100644 36--- a/src/3rdparty/assimp/assimp_dependency.pri 37+++ b/src/3rdparty/assimp/assimp_dependency.pri 38@@ -1,5 +1,5 @@ 39 QT_FOR_CONFIG += 3dcore-private 40-qtConfig(system-assimp):!if(cross_compile:host_build) { 41+!tools-only:qtConfig(system-assimp):!if(cross_compile:host_build) { 42 QMAKE_USE_PRIVATE += assimp 43 } else { 44 include(assimp.pri) 45diff --git a/tools/tools.pro b/tools/tools.pro 46index 3b457ed50..9f5376a0a 100644 47--- a/tools/tools.pro 48+++ b/tools/tools.pro 49@@ -1,9 +1,9 @@ 50 TEMPLATE = subdirs 51 52-!qtHaveModule(3dcore): \ 53+!tools-only:!qtHaveModule(3dcore): \ 54 return() 55 56 QT_FOR_CONFIG += 3dcore-private 57-qtConfig(assimp):qtConfig(commandlineparser): { 58+tools-only|qtConfig(assimp):qtConfig(commandlineparser): { 59 SUBDIRS += qgltf 60 } 61