diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2016-04-11 20:48:39 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-04-12 18:19:09 +0000 |
| commit | b6b65063800bf939144a4b63339c7ee41339c03b (patch) | |
| tree | 9e941a18b2951e11250789230c3a99ac0228c7d7 /src/3rdparty | |
| parent | 9cf741e9cbba0de12af0e6ccc460f3b7a96d3d7a (diff) | |
Ignore ICC warning about change of sign in Assimp
You can't assign -1 to an unsigned and expect it to retain the
sign. Assimp has a lot of those and should be fixed (it's not portable
to assume -1 becomes ~0). But since this is a third-party library, it's
not worth my time to submit a patch.
Change-Id: Id75834dab9ed466e94c7ffff14448010fe7e0c90
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/assimp/assimp.pri | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index 96a3f93de..ba0920833 100644 --- a/src/3rdparty/assimp/assimp.pri +++ b/src/3rdparty/assimp/assimp.pri @@ -19,18 +19,23 @@ contains(QT_CONFIG, system-zlib):!if(cross_compile:host_build) { DEFINES += ASSIMP_BUILD_NO_OWN_ZLIB ASSIMP_BUILD_NO_COMPRESSED_IFC ASSIMP_BUILD_NO_Q3BSP_IMPORTER -# Stop compiler complaining about ignored qualifiers on return types intel_icc: { + # warning #310: old-style parameter list (anachronism) + QMAKE_CFLAGS_WARN_ON += -wd310 + + # warning #68: integer conversion resulted in a change of sign + QMAKE_CFLAGS_WARN_ON += -wd68 + + # warning #858: type qualifier on return type is meaningless QMAKE_CFLAGS_WARN_ON += -wd858 + QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON } else:gcc|clang: { + # Stop compiler complaining about ignored qualifiers on return types QMAKE_CFLAGS_WARN_ON += -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated-declarations -Wno-unused-function -Wno-reorder QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON } -# warning #310: old-style parameter list (anachronism) -intel_icc: QMAKE_CFLAGS_WARN_ON += -wd310 - CONFIG += warn_on VPATH += \ |