diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2019-09-17 17:43:45 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2019-10-23 10:17:59 +0000 |
| commit | 30f5da09a033bb1993b3ba06e59c3afa4710a087 (patch) | |
| tree | 7dc70c75c38963aaabecedf30686ac141a2deb83 | |
| parent | 4e6b2cd0b6ee275ef38392e7e0b0ab2de6718bb4 (diff) | |
Ensure we can build assimp on Windows and macOS with non gcc compilers
Fixes: QTBUG-75145
Change-Id: Ibee7d877bf78c2d2ed74ac8a89b7af5bf22f14f1
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
(cherry picked from commit b18845b0451cf0ff9c7611483b589ce51b3c9e1b)
| -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 9bb0ada36..e57bcac22 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 -qtConfig(assimp):if(qtConfig(system-assimp)|android-clang|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 |