diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-09 01:00:17 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-09 09:31:24 +0200 |
| commit | 90f85482bb0499a55993b94743266fedf4cefef1 (patch) | |
| tree | a97a45390ace4b284d80a506e76d2e58bb24d29c /src/qml/qtqml.tracepoints | |
| parent | ae8c798a0a01334d1af33a59acdaeda8898a9f5c (diff) | |
| parent | 0a775ded35acf7172e3f852d55de7e28a5370653 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/compiler/qqmlirbuilder.cpp
Change-Id: I2cfda470515e2df778ad3c89105c07344af07c6d
Diffstat (limited to 'src/qml/qtqml.tracepoints')
| -rw-r--r-- | src/qml/qtqml.tracepoints | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/qml/qtqml.tracepoints b/src/qml/qtqml.tracepoints new file mode 100644 index 0000000000..841748f201 --- /dev/null +++ b/src/qml/qtqml.tracepoints @@ -0,0 +1,14 @@ +{ +namespace QV4 { +class ExecutionEngine; +namespace CompiledData { +class CompilationUnit; +class Object; +} // CompiledData +} // QV4 +} + +QQmlObjectCreator_createInstance_entry(const QV4::CompiledData::CompilationUnit *compilationUnit, const QV4::CompiledData::Object *object, const QUrl &url) +QQmlObjectCreator_createInstance_exit(const QString &typeName) +QQmlV4_function_call_entry(const QV4::ExecutionEngine *engine, const QString &function, const QString &fileName, int line, int column) +QQmlV4_function_call_exit() |