diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-01-25 14:30:30 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-01-25 14:31:06 +0100 |
| commit | 00d3f3e9da071efce92d320884b331ea559fb292 (patch) | |
| tree | 0649bd5c1be5a8ca01617655ac54c6373322f14a /src/qml/jsruntime/qv4include_p.h | |
| parent | 5c2ba6db53b2190160081695faff521bc367e33d (diff) | |
| parent | b07a6cf8c5788b7e4ca722c9aa8c06e76e688c5d (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: I7b6437740077a4e2c9b2c36ee1cd4eb472f1f49f
Diffstat (limited to 'src/qml/jsruntime/qv4include_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4include_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4include_p.h b/src/qml/jsruntime/qv4include_p.h index 4c601a5e7b..5908d6bfde 100644 --- a/src/qml/jsruntime/qv4include_p.h +++ b/src/qml/jsruntime/qv4include_p.h @@ -77,7 +77,7 @@ public: Exception = 3 }; - static QV4::ReturnedValue method_include(QV4::CallContext *ctx); + static void method_include(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData); private Q_SLOTS: void finished(); |