diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-02-07 14:52:41 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-16 05:11:18 +0100 |
| commit | 1e43b64a7a5c3823a6bdcb8d0cd28a17955939a2 (patch) | |
| tree | d04a48ee55209ee5dccfc59863aa4f5df959e51f /src/corelib/tools/qbytearray.cpp | |
| parent | c0791ac76ec7cfdc3945efa67a6f72ee3623413c (diff) | |
Centralize the merging toFloat conversions
The QByteArray version was missing the overflow check that the other
versions had.
Change-Id: I03cd92e5e5a84c038bee1f1ee217e93e9d9a675a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/corelib/tools/qbytearray.cpp')
| -rw-r--r-- | src/corelib/tools/qbytearray.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 5755bc6ffe..304ce69449 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -3545,7 +3545,7 @@ double QByteArray::toDouble(bool *ok) const float QByteArray::toFloat(bool *ok) const { - return float(toDouble(ok)); + return QLocaleData::convertDoubleToFloat(toDouble(ok), ok); } /*! |