From 3166eed9ec9883cb0df5ecc4fbeae68760bb5a58 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Thu, 1 Oct 2020 10:20:06 +0100 Subject: Fix the assimp scene parser clause So that it actually gets disabled whwn specifying -no-assimp. Pick-to: 5.15 Change-Id: I23c166ef977103f2893c8df721a29d8d147badde Reviewed-by: Mike Krus --- src/plugins/sceneparsers/sceneparsers.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/sceneparsers/sceneparsers.pro b/src/plugins/sceneparsers/sceneparsers.pro index e57bcac22..ee48da565 100644 --- a/src/plugins/sceneparsers/sceneparsers.pro +++ b/src/plugins/sceneparsers/sceneparsers.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs # QNX is not supported, and Linux GCC 4.9 on ARM chokes on the assimp # sources (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66964). QT_FOR_CONFIG += 3dcore-private -!ios:!tvos:!qcc:qtConfig(assimp):if(qtConfig(system-assimp)|android-clang|clang|win32-msvc)|if(gcc:greaterThan(QT_GCC_MAJOR_VERSION, 4)) { +!ios:!tvos:!qcc:qtConfig(assimp):if(qtConfig(system-assimp)|android-clang|clang|win32-msvc):if(gcc:greaterThan(QT_GCC_MAJOR_VERSION, 4)) { SUBDIRS += assimp } SUBDIRS += gltf -- cgit v1.2.3