From d8c97a5f0b1f85e79829dbcc63b82bc5b1d83233 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Wed, 2 Aug 2023 12:54:56 +0300 Subject: Make checking for float64 tags work on 32-bit architectures Fixes: QBS-1745 Change-Id: I11fb7fc8d9b047e814fd090141a0c434e1b6cd63 Reviewed-by: Christian Kandeler --- changelogs/changes-2.1.1.md | 3 ++- src/lib/corelib/tools/scripttools.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changelogs/changes-2.1.1.md b/changelogs/changes-2.1.1.md index d0cdaad4f..eeaa71cc6 100644 --- a/changelogs/changes-2.1.1.md +++ b/changelogs/changes-2.1.1.md @@ -1,8 +1,9 @@ # General * Fixed Probe lookup in multiplexed products. * Fixed excessively slow module merging in some circumstances. -* Fixed building QuickJS on x86 systems. +* Fixed QuickJS for x86. # Contributors * Christian Kandeler +* Dmitry Shachnev * Ivan Komissarov diff --git a/src/lib/corelib/tools/scripttools.cpp b/src/lib/corelib/tools/scripttools.cpp index 83005c788..efa942fd5 100644 --- a/src/lib/corelib/tools/scripttools.cpp +++ b/src/lib/corelib/tools/scripttools.cpp @@ -318,7 +318,7 @@ static QVariant getJsVariantImpl(JSContext *ctx, JSValue val, QList pat const auto tag = JS_VALUE_GET_TAG(val); if (tag == JS_TAG_INT) return JS_VALUE_GET_INT(val); - else if (tag == JS_TAG_FLOAT64) + else if (JS_TAG_IS_FLOAT64(tag)) return JS_VALUE_GET_FLOAT64(val); return {}; } -- cgit v1.2.3