diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-15 01:00:06 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-02-15 10:41:32 +0100 |
| commit | 1ffb45a3682c864f8071b8b19da49c9a7761dd5e (patch) | |
| tree | b714f329d1e2a1ecccc0d5c13fb829f924f0d801 /src/qml/jit/qv4assemblercommon_p.h | |
| parent | 3dcc9dde65c780fb87ff9feef60dfb16d6748eb0 (diff) | |
| parent | d96a700cc3611480ff76023287cb06f455a37b02 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/qml/qml/qqmlpropertycache.cpp
Change-Id: Ie7727499700b85cc0959ef3abb30d55dc728b659
Diffstat (limited to 'src/qml/jit/qv4assemblercommon_p.h')
| -rw-r--r-- | src/qml/jit/qv4assemblercommon_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qml/jit/qv4assemblercommon_p.h b/src/qml/jit/qv4assemblercommon_p.h index 3e70457bd8..d3d7eedae2 100644 --- a/src/qml/jit/qv4assemblercommon_p.h +++ b/src/qml/jit/qv4assemblercommon_p.h @@ -711,7 +711,6 @@ public: private: void passAccumulatorAsArg_internal(int arg, bool doPush); static Address argStackAddress(int arg); - static Address inArgStackAddress(int arg); private: const Value* constantTable; |