diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-19 03:01:50 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-19 03:01:50 +0100 |
| commit | d23bb633574fbfefde8a6b718487a448fb6d936b (patch) | |
| tree | cb47022382d26a26be4e80b1d6383462b6e08fb9 /src/plugins/sceneparsers | |
| parent | 22d24c182687ef4334582d5e35744388a7f00f53 (diff) | |
| parent | e8f551be32913f5a9f9e9ce011b172a4a2a366b0 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I129f54fd4c10318282428ea435f739930c6f3b08
Diffstat (limited to 'src/plugins/sceneparsers')
| -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 e4b421606..9bb0ada36 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|!cross_compile): { +qtConfig(assimp):if(qtConfig(system-assimp)|android-clang|gcc:greaterThan(QT_GCC_MAJOR_VERSION, 4)): { SUBDIRS += assimp } SUBDIRS += gltf |