diff options
| author | Joni Poikelin <joni.poikelin@qt.io> | 2020-11-24 18:11:14 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-27 17:07:31 +0000 |
| commit | 5927b38f802532f9e320b55e0e7adb734dd56ecb (patch) | |
| tree | 23d6f5dacf3e377fc075f14c9af9d12e7ea6112a | |
| parent | cd6823d09c3c956e18c3db9dedde00dfb12d801b (diff) | |
Allow assimp to compile on non-gcc compilers
Gcc 4 version check can also be dropped since it is not supported
anymore.
Fixes: QTBUG-88821
Change-Id: Ice522afc92823156e9545e8e75b16c2c0a614d6f
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit c6716fa7f044985389038802a296bae83951b119)
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 f2b09f7ea..573a5ddad 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(qt3d-assimp):if(qtConfig(qt3d-system-assimp)|android-clang|clang|win32-msvc):if(gcc:greaterThan(QT_GCC_MAJOR_VERSION, 4)) { +!ios:!tvos:!qcc:qtConfig(qt3d-assimp):if(qtConfig(qt3d-system-assimp)|android-clang|clang|win32-msvc|gcc) { SUBDIRS += assimp } SUBDIRS += gltf |