diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-16 20:52:45 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-16 20:52:46 +0200 |
| commit | b1b1cec6874b1a1760ad283e3f863b6639a646c9 (patch) | |
| tree | 724dd03f7517a6dcda348a88a9618c90705b33f3 /src | |
| parent | b0b754632e851ca1ae46a8e08fe5b3f8949c6042 (diff) | |
| parent | 07502898e982dae54f919582350af8be3b4ad2cc (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Id404864b00962efd9f9eaea33437ae3924a17000
Diffstat (limited to 'src')
| -rw-r--r-- | src/angle/src/config.pri | 3 |
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. |