aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v8/qv8engine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/qml/v8/qv8engine.cpp')
-rw-r--r--src/qml/qml/v8/qv8engine.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index 993cf96104..39b816f97c 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -88,7 +88,11 @@ ReturnType convertJSValueToVariantType(const QJSValue &value)
static void saveJSValue(QDataStream &stream, const void *data)
{
const QJSValue *jsv = reinterpret_cast<const QJSValue *>(data);
- const quint32 isNullOrUndefined = jsv->isNull() | (jsv->isUndefined() << 1);
+ quint32 isNullOrUndefined = 0;
+ if (jsv->isNull())
+ isNullOrUndefined |= 0x1;
+ if (jsv->isUndefined())
+ isNullOrUndefined |= 0x2;
stream << isNullOrUndefined;
if (!isNullOrUndefined)
reinterpret_cast<const QJSValue*>(data)->toVariant().save(stream);