diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-11-23 21:03:15 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-14 15:46:35 +0000 |
| commit | 27c07d859a9704bab78b989297b2d9ce5629aeef (patch) | |
| tree | 17afce16d71ea734b3d842225a2b53e85f0ccfbb /src/plugins/sceneparsers/sceneparsers.pro | |
| parent | 825f7fe1d80583fe70c1616e1d3973cc3dc65e7b (diff) | |
centralize + fix use of system assimp
follow the foo.pri & foo_dependency.pri pattern found in qtbase to
de-duplicate the code (and thus implicitly make it consistent) and
synchronize the conditionals in the configure test.
also document why we still can't enable the assimp sceneparser in all
configurations.
Change-Id: I3bdc30e077b6c9c7027a9311195c08a6c5f1fcf4
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/plugins/sceneparsers/sceneparsers.pro')
| -rw-r--r-- | src/plugins/sceneparsers/sceneparsers.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/sceneparsers/sceneparsers.pro b/src/plugins/sceneparsers/sceneparsers.pro index 9271659db..ccb7a96aa 100644 --- a/src/plugins/sceneparsers/sceneparsers.pro +++ b/src/plugins/sceneparsers/sceneparsers.pro @@ -1,3 +1,5 @@ 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 |