From f754cd0ce97a3a91b94c501c4d553692f622b88c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 19 Mar 2025 11:07:33 -0700 Subject: [PATCH] QVariant: use QMETATYPE_CONVERTER_ASSIGN_DOUBLE to convert from QCborValue No-op change. All this does is explicitly wrap the right side of the expression in a double() function-style cast. Pick-to: 6.8 Change-Id: I84bc14bf75b4d0a046dcfffd19f318eaf7fe0e9f Reviewed-by: Marc Mutz Reviewed-by: Fabian Kosmale (cherry picked from commit ab45c44fb5471cef907334a1f6d7dbad279dd707) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qmetatype.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 34981b16a56..132791fa390 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -1391,8 +1391,8 @@ static constexpr struct : QMetaTypeModuleHelper QMETATYPE_CONVERTER_ASSIGN(QCborValue, Char); QMETATYPE_CONVERTER_ASSIGN(QCborValue, SChar); QMETATYPE_CONVERTER_ASSIGN(QCborValue, Short); - QMETATYPE_CONVERTER_ASSIGN(QCborValue, Double); - QMETATYPE_CONVERTER_ASSIGN(QCborValue, Float); + QMETATYPE_CONVERTER_ASSIGN_DOUBLE(QCborValue, Double); + QMETATYPE_CONVERTER_ASSIGN_DOUBLE(QCborValue, Float); QMETATYPE_CONVERTER(QCborValue, QStringList, result = QCborArray::fromStringList(source); return true;