From 9b25000cb41b97c9c9f49a542c9b82cf25c032db Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Fri, 20 Oct 2017 16:11:37 +0200
Subject: Get rid of the implicit cast operator to a CallData

Change-Id: I1c35fbf8f7355bc2393ae931f99e591b800f2f45
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
---
 src/qml/jsruntime/qv4jscall_p.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/qml/jsruntime/qv4jscall_p.h')

diff --git a/src/qml/jsruntime/qv4jscall_p.h b/src/qml/jsruntime/qv4jscall_p.h
index ed75fb7475..0bb2d840da 100644
--- a/src/qml/jsruntime/qv4jscall_p.h
+++ b/src/qml/jsruntime/qv4jscall_p.h
@@ -103,7 +103,9 @@ struct JSCallData {
         return ptr;
     }
 
-    operator CallData *() const {
+    CallData *callData(const FunctionObject *f = nullptr) const {
+        if (f)
+            ptr->function = f->asReturnedValue();
         return ptr;
     }
 
-- 
cgit v1.2.3