diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
| commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
| tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/plugins/sceneparsers/sceneparsers.pro | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/plugins/sceneparsers/sceneparsers.pro')
| -rw-r--r-- | src/plugins/sceneparsers/sceneparsers.pro | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/sceneparsers/sceneparsers.pro b/src/plugins/sceneparsers/sceneparsers.pro index befe08e41..cb274b472 100644 --- a/src/plugins/sceneparsers/sceneparsers.pro +++ b/src/plugins/sceneparsers/sceneparsers.pro @@ -1,5 +1,11 @@ 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). -config_assimp|!cross_compile: SUBDIRS += assimp -SUBDIRS += gltf gltfexport +QT_FOR_CONFIG += 3dcore-private +qtConfig(assimp):if(qtConfig(system-assimp)|!cross_compile): \ + SUBDIRS += assimp +SUBDIRS += gltf + +qtConfig(temporaryfile):qtConfig(regularexpression) { + SUBDIRS += gltfexport +} |