diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-04-25 09:40:04 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-04-25 09:40:04 +0200 |
| commit | b334a92493c9e4956b0fc631610857d1b1cf5f6d (patch) | |
| tree | bdc85d9b49f4b8d666b34e4d87abf629f579f1e2 /src/qml/compiler/qv4compileddata_p.h | |
| parent | 0eeb7ada04cc81d0ab1b61747bdf92fd7c33e1ec (diff) | |
| parent | 27079f9168463b5b27aeb2d1f93f867bf714e71a (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: If2e7c1cf0f1522f6052bbc3e3636ef62bef1b4db
Diffstat (limited to 'src/qml/compiler/qv4compileddata_p.h')
| -rw-r--r-- | src/qml/compiler/qv4compileddata_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h index 6e9121b5e3..f4ba257cf5 100644 --- a/src/qml/compiler/qv4compileddata_p.h +++ b/src/qml/compiler/qv4compileddata_p.h @@ -897,7 +897,7 @@ struct Q_QML_PRIVATE_EXPORT CompilationUnit : public CompilationUnitBase, public QV4::Function *linkToEngine(QV4::ExecutionEngine *engine); void unlink(); - void markObjects(QV4::ExecutionEngine *e); + void markObjects(MarkStack *markStack); void destroy() Q_DECL_OVERRIDE; |