summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2013-08-06 11:32:18 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-16 16:04:49 +0200
commit07502898e982dae54f919582350af8be3b4ad2cc (patch)
tree6f66157e83ced088105143279b69b6396de33123
parent5b32132762cdaeb558833d5e36629b4248d4be48 (diff)
ANGLE: Fix MSVC compiler warning
We don't use exceptions anyway, so we can safely ignore this warning. Task-number: QTBUG-32833 Change-Id: Id78cb99770f37a076de3a95721ba40795a8a7b57 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
-rw-r--r--src/angle/src/config.pri3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/angle/src/config.pri b/src/angle/src/config.pri
index 465bcf6a1e..1c6d8b0167 100644
--- a/src/angle/src/config.pri
+++ b/src/angle/src/config.pri
@@ -78,10 +78,11 @@ msvc {
# 4239: nonstandard extension used : 'token' : conversion from 'type' to 'type'
# 4244: 'argument' : conversion from 'type1' to 'type2', possible loss of data
# 4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch
+ # 4275: non - DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier'
# 4512: 'class' : assignment operator could not be generated
# 4702: unreachable code
QMAKE_CFLAGS_WARN_ON -= -W3
- QMAKE_CFLAGS_WARN_ON += -W4 -wd"4100" -wd"4127" -wd"4189" -wd"4239" -wd"4244" -wd"4245" -wd"4512" -wd"4702"
+ QMAKE_CFLAGS_WARN_ON += -W4 -wd"4100" -wd"4127" -wd"4189" -wd"4239" -wd"4244" -wd"4245" -wd"4275" -wd"4512" -wd"4702"
# Optimizations
# /Oy: Omits frame pointer (x86 only).
# /Gy: Enables function-level linking.