diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-12-03 06:55:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-03 06:57:05 +0100 |
| commit | e62d04b933a91c2bdd347aa97dc15ba210a04d2a (patch) | |
| tree | 67c67af5f59d9b71522738da8a8d2d803e3ff44f /src/corelib/global/qfloat16.h | |
| parent | f81f21151d30a37f955aa4af2398a96507626b15 (diff) | |
| parent | 9ac156c90b92a981f70929e081c64083b14e9a57 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/serialization/qcborvalue.cpp
Change-Id: I675a3029955c96e81a33ed9d98b72b55b6784b52
Diffstat (limited to 'src/corelib/global/qfloat16.h')
| -rw-r--r-- | src/corelib/global/qfloat16.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h index 154b200475..f35eefd922 100644 --- a/src/corelib/global/qfloat16.h +++ b/src/corelib/global/qfloat16.h @@ -244,6 +244,7 @@ QF16_MAKE_ARITH_OP_INT(/) QT_WARNING_PUSH QT_WARNING_DISABLE_CLANG("-Wfloat-equal") QT_WARNING_DISABLE_GCC("-Wfloat-equal") +QT_WARNING_DISABLE_INTEL(1572) inline bool operator>(qfloat16 a, qfloat16 b) noexcept { return static_cast<float>(a) > static_cast<float>(b); } inline bool operator<(qfloat16 a, qfloat16 b) noexcept { return static_cast<float>(a) < static_cast<float>(b); } |