diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-12 01:00:07 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-12 01:00:08 +0200 |
| commit | f8212b87d9b9474eaba2493662ef6c2d2e7a4376 (patch) | |
| tree | e3d56ef186ef2004892ee4f446a36de308ac39e4 /src/corelib/global/qfloat16.cpp | |
| parent | 591116490cf313808e8ba05ddd066656a1d1a566 (diff) | |
| parent | 45aa3c73f78c6c06874d0f826e1f112976cd522d (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I0c00ffe0eabebc919f22d6faa4bf958b288e8fd9
Diffstat (limited to 'src/corelib/global/qfloat16.cpp')
| -rw-r--r-- | src/corelib/global/qfloat16.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp index fd608efe55..87ff796368 100644 --- a/src/corelib/global/qfloat16.cpp +++ b/src/corelib/global/qfloat16.cpp @@ -65,6 +65,19 @@ QT_BEGIN_NAMESPACE */ /*! + \macro QT_NO_FLOAT16_OPERATORS + \relates <QFloat16> + \since 5.12.4 + + Defining this macro disables the arithmetic operators for qfloat16. + + This is only necessary on Visual Studio 2017 (and earlier) when including + \c {<QFloat16>} and \c{<bitset>} in the same translation unit, which would + otherwise cause a compilation error due to a toolchain bug (see + [QTBUG-72073]). +*/ + +/*! Returns true if the \c qfloat16 \a {f} is equivalent to infinity. \relates <QFloat16> |