aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4dataview_p.h
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2016-10-13 17:21:41 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2016-10-13 17:21:48 +0200
commit90fa3414156522ef89f9ebe8cefd6dad303ce06c (patch)
tree65ba250895722795ce3d14fb9b4341953ffd1733 /src/qml/jsruntime/qv4dataview_p.h
parent2a999f870e791d99c5c0463a11be05fc5a14dfcc (diff)
parenta05fec277d0a122e03bb6c7756777729df50b1f2 (diff)
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Diffstat (limited to 'src/qml/jsruntime/qv4dataview_p.h')
-rw-r--r--src/qml/jsruntime/qv4dataview_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4dataview_p.h b/src/qml/jsruntime/qv4dataview_p.h
index 2e8e94cecd..f996a4c2f1 100644
--- a/src/qml/jsruntime/qv4dataview_p.h
+++ b/src/qml/jsruntime/qv4dataview_p.h
@@ -76,8 +76,8 @@ struct DataViewCtor: FunctionObject
{
V4_OBJECT2(DataViewCtor, FunctionObject)
- static ReturnedValue construct(const Managed *m, CallData *callData);
- static ReturnedValue call(const Managed *that, CallData *callData);
+ static void construct(const Managed *m, Scope &scope, CallData *callData);
+ static void call(const Managed *that, Scope &scope, CallData *callData);
};
struct DataView : Object