diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-03 01:00:11 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-03 01:00:11 +0200 |
| commit | 682513bed4401fbc5f8fbaf52752565dbdb0fd03 (patch) | |
| tree | 130a1eb852a1e596a76608193be86cd08bf3c57d /src/corelib/tools/qlocale_p.h | |
| parent | b91e6f6f40864d54903d707d7f19a9732188b670 (diff) | |
| parent | f99fe9cee9d35e1fabbf45364631f4a7f049ebe3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I99a27f9a0402e1ccad45a2d062d784f8d9a08dd3
Diffstat (limited to 'src/corelib/tools/qlocale_p.h')
| -rw-r--r-- | src/corelib/tools/qlocale_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index 1e8dc28fbf..5edeed1954 100644 --- a/src/corelib/tools/qlocale_p.h +++ b/src/corelib/tools/qlocale_p.h @@ -254,10 +254,8 @@ public: const float huge = std::numeric_limits<float>::infinity(); return d < 0 ? -huge : huge; } - if (std::fabs(d) >= std::numeric_limits<double>::min() // i.e. d != 0 - && std::fabs(d) < std::numeric_limits<float>::min()) { - // Values smaller than std::numeric_limits<double>::min() have - // failed already; match them. + if (d != 0 && float(d) == 0) { + // Values that underflow double already failed. Match them: if (ok != 0) *ok = false; return 0; |