diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2020-10-01 10:20:06 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-10-01 12:48:26 +0000 |
| commit | 21f034e8cb02dc6fe22b6888dc159dc518c4bccf (patch) | |
| tree | f6b85eaa5755e397b395dc86cf3f1993bdb9b7d6 | |
| parent | 5b354f93fb74cbbaaed49bc1e4d3d1c4c2e2ffe5 (diff) | |
Fix the assimp scene parser clause
So that it actually gets disabled whwn specifying -no-assimp.
Change-Id: I23c166ef977103f2893c8df721a29d8d147badde
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 3166eed9ec9883cb0df5ecc4fbeae68760bb5a58)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/sceneparsers/sceneparsers.pro | 2 |
1 files changed, 1 insertions, 1 deletions
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 |