diff options
| -rw-r--r-- | src/plugins/sceneparsers/sceneparsers.pro | 3 | ||||
| -rw-r--r-- | tools/tools.pro | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/sceneparsers/sceneparsers.pro b/src/plugins/sceneparsers/sceneparsers.pro index cb274b472..e4b421606 100644 --- a/src/plugins/sceneparsers/sceneparsers.pro +++ b/src/plugins/sceneparsers/sceneparsers.pro @@ -2,8 +2,9 @@ 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)|!cross_compile): \ +qtConfig(assimp):if(qtConfig(system-assimp)|android-clang|!cross_compile): { SUBDIRS += assimp +} SUBDIRS += gltf qtConfig(temporaryfile):qtConfig(regularexpression) { diff --git a/tools/tools.pro b/tools/tools.pro index 64f2b9fc7..c2f692034 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,4 +1,5 @@ TEMPLATE = subdirs QT_FOR_CONFIG += 3dcore-private -qtConfig(assimp):qtConfig(commandlineparser): \ +qtConfig(assimp):qtConfig(commandlineparser):!cross_compile: { SUBDIRS += qgltf +} |