From 9272c77091b58399e05d2843d4e627186f906507 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Thu, 20 Apr 2017 09:21:12 +0200 Subject: Fix build for -no-feature-commandlineparser Change-Id: Ib84385167b2d71e460de87fbda58d59173385258 Reviewed-by: Kevin Ottens Reviewed-by: Sean Harmer --- tools/tools.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/tools.pro') diff --git a/tools/tools.pro b/tools/tools.pro index 9c384630e..4dbd7496a 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -!android:SUBDIRS += qgltf +qtConfig(commandlineparser):!android:SUBDIRS += qgltf -- cgit v1.2.3 From 80e4d6db6b5636b839cef7e79b2b8ff528329ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A4=C3=A4tt=C3=A4=20Antti?= Date: Tue, 18 Apr 2017 10:09:47 +0300 Subject: Modify configure to build with no assimp Add -no-assimp configure to build without assimp. Task-number: QTBUG-60128 Change-Id: I2ca7bb68d3b659e18bd79039beb5cb6623473859 Reviewed-by: Sean Harmer --- tools/tools.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools/tools.pro') diff --git a/tools/tools.pro b/tools/tools.pro index 4dbd7496a..8e973aecb 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,2 +1,4 @@ TEMPLATE = subdirs -qtConfig(commandlineparser):!android:SUBDIRS += qgltf +QT_FOR_CONFIG += 3dcore-private +!android:qtConfig(assimp):qtConfig(commandlineparser): \ + SUBDIRS += qgltf -- cgit v1.2.3