diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-13 22:56:02 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-13 22:56:03 +0100 |
| commit | 9c055e8e47d9411a8f34abe6872e4bfd942cc372 (patch) | |
| tree | 895e139477c88a064a993f035afec614de9dafc7 /src/corelib/kernel/qvariant.cpp | |
| parent | d08e0e861acadf3a354d3833dd5623ef71fa7a4b (diff) | |
| parent | 76010f4af8c9a59a20c489d70c7f99b802f9721f (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Iaec2e57d6bf33355ddfa61d25133580a8740335f
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 7ccacd883f3..96299b9eafd 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)); |