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