From 95778d80a6053fcaf66f7c37b1d58c140a4fa48d Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Fri, 19 Sep 2014 09:23:22 +0200
Subject: Fix compiler warnings in qv8engine.cpp.

qml\v8\qv8engine.cpp(91) : warning C4805: '|' : unsafe mix of type 'bool' and type 'int' in operation

Task-number: QTBUG-40431
Change-Id: Ibdc96907aaab132956c87dd6aec2eab2f3bf0e9f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/qml/qml/v8/qv8engine.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/qml/qml/v8/qv8engine.cpp')

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);
-- 
cgit v1.2.3