QVariant: Add missing conversion from QJsonValue to double & float

Change-Id: I56b444f9d6274221a3b7fffd150d2ff1df5228bc Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-01-25 15:02:45 -08:00 · 2018-01-25 15:02:45 -08:00 · fcad1c762b
parent abc891ee7c
commit fcad1c762b
1 changed files with 4 additions and 0 deletions
--- 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));