summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2017-02-12 13:37:38 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-02-12 19:30:12 +0000
commita49094c50e8971d92e918a71f2371dc23587497e (patch)
tree4bce3cd2c9f259a692a0208ef8771d2b7bedc335 /src/3rdparty
parent518a7a922cc90865744c4e302650528796c75147 (diff)
Silence warning 4828 in assimp on MSVC
Change-Id: I50dc8a64cfbf292228a88a7e7356dd958d592b4c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/assimp/assimp.pri4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri
index 802a645fe..771c291bf 100644
--- a/src/3rdparty/assimp/assimp.pri
+++ b/src/3rdparty/assimp/assimp.pri
@@ -38,7 +38,9 @@ intel_icc: {
# 4189: 'identifier' : local variable is initialized but not referenced
# 4267: coversion from 'size_t' to 'int', possible loss of data
# 4996: Function call with parameters that may be unsafe
- QMAKE_CFLAGS_WARN_ON += -wd"4100" -wd"4189" -wd"4267" -wd"4996"
+ # 4828: The file contains a character starting at offset 0x167b that
+ # is illegal in the current source character set (codepage 65001)
+ QMAKE_CFLAGS_WARN_ON += -wd"4100" -wd"4189" -wd"4267" -wd"4996" -wd"4828"
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
}