From: Kent Hansen <kent.hansen@nokia.com>
Date: Wed, 23 May 2012 21:09:15 +0000 (+0200)
Subject: Fix the logic in void return type check
X-Git-Tag: 071012131707~312
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1956ec4792f557a910e195e2276a124550337aeb;p=profile%2Fivi%2Fqtdeclarative.git

Fix the logic in void return type check

Since the introduction of QMetaType::UnknownType, QMetaType::Void no
longer has value 0. Hence, the optimization in this code (avoiding
return type construction/passing/conversion when the return type is
void) was "lost".

Change-Id: I32313f8287c4f0e01fee3c2b4ba722f31457242c
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
---

diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp
index f540ce1..d7e55e2 100644
--- a/src/qml/qml/v8/qv8qobjectwrapper.cpp
+++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp
@@ -1555,7 +1555,7 @@ static v8::Handle<v8::Value> CallMethod(QObject *object, int index, int returnTy
 
         return args[0].toValue(engine);
 
-    } else if (returnType != 0) {
+    } else if (returnType != QMetaType::Void) {
         
         CallArgument arg;
         arg.initAsType(returnType);