diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-19 22:23:32 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-19 22:23:32 +0100 |
| commit | 4e69075dd1f80e16f45f5b282bf494fc7cf256a8 (patch) | |
| tree | 23ea79629eff2a14df264985588637c20909ba71 /src/3rdparty | |
| parent | f1a018c657d98b2e22436a083cc4a6821ea0f0ad (diff) | |
| parent | 0384f29809186e6a45b13760c9dbb2f8cd3bf251 (diff) | |
Merge branch '5.6' into 5.7
Change-Id: Ie0fc178d3c0f818ea32aac0e98c97861d4c0f671
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/assimp/assimp.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index ba0920833..f0a7bf757 100644 --- a/src/3rdparty/assimp/assimp.pri +++ b/src/3rdparty/assimp/assimp.pri @@ -4,7 +4,7 @@ # AssImp expects this to be defined on debug builds CONFIG(debug, debug|release) : DEFINES+=_DEBUG -CONFIG += exceptions +CONFIG += exceptions rtti CONFIG -= precompile_header |