diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-01-25 15:02:45 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-02-11 17:59:28 +0000 |
| commit | fcad1c762b6eb50f241c4208eea39ef495e49b05 (patch) | |
| tree | 5af035d21597f8234cc9c08520563954c36664d0 /src/corelib/kernel/qvariant.cpp | |
| parent | abc891ee7cf12ae3b359811883d674c61793cc1d (diff) | |
QVariant: Add missing conversion from QJsonValue to double & float
Change-Id: I56b444f9d6274221a3b7fffd150d2ff1df5228bc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/kernel/qvariant.cpp')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 7ccacd883f..96299b9eaf 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -256,6 +256,10 @@ static qreal qConvertToRealNumber(const QVariant::Private *d, bool *ok) case QMetaType::UShort: case QMetaType::ULong: return qreal(qMetaTypeUNumber(d)); +#ifndef QT_BOOTSTRAPPED + case QMetaType::QJsonValue: + return v_cast<QJsonValue>(d)->toDouble(); +#endif default: // includes enum conversion as well as invalid types return qreal(qConvertToNumber(d, ok)); |