diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-04 07:31:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-04 07:33:14 +0100 |
| commit | 03039979b5a643f9def38a73e19835bb69384202 (patch) | |
| tree | e8a9184d5963128f013247ac64ec768d1cbf6911 /src/corelib/global/qfloat16.h | |
| parent | 9682d217e21a2e88b6de799d79b843bbe0039df1 (diff) | |
| parent | 4dc2bc323c985bdceb27f096dd6c8e7af657bb6b (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Also blacklist tst_QRawFont::unsupportedWritingSystem() and
tst_QGlyphRun::mixedScripts() on windows for now.
Conflicts:
qmake/generators/makefile.cpp
src/corelib/itemmodels/qstringlistmodel.cpp
src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp
tests/auto/gui/text/qglyphrun/BLACKLIST
tests/auto/gui/text/qrawfont/BLACKLIST
Task-number: QTBUG-72836
Change-Id: I10fea1493f0ae1a5708e1e48d0a4d7d6b76258b9
Diffstat (limited to 'src/corelib/global/qfloat16.h')
| -rw-r--r-- | src/corelib/global/qfloat16.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h index 766ab319a4..42cb1357f1 100644 --- a/src/corelib/global/qfloat16.h +++ b/src/corelib/global/qfloat16.h @@ -121,6 +121,7 @@ Q_REQUIRED_RESULT inline bool qIsNull(qfloat16 f) Q_DECL_NOTHROW inline int qIntCast(qfloat16 f) Q_DECL_NOTHROW { return int(static_cast<float>(f)); } +#ifndef Q_QDOC QT_WARNING_PUSH QT_WARNING_DISABLE_CLANG("-Wc99-extensions") QT_WARNING_DISABLE_GCC("-Wold-style-cast") @@ -160,6 +161,7 @@ inline qfloat16::operator float() const Q_DECL_NOTHROW return f; #endif } +#endif inline qfloat16 operator-(qfloat16 a) Q_DECL_NOTHROW { |