diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-18 01:00:17 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-18 08:01:45 +0200 |
| commit | 934f25028a232c9bccdb842f53fa67959cc8dffc (patch) | |
| tree | a78fef6197d63feab3194eb7f4cd2e10934b18ee /src/qml/compiler/qv4compilercontext_p.h | |
| parent | f8e90c61c5da4ca5e0aec24d42b2962877289ab2 (diff) | |
| parent | 2bdbf216fe7b6cf9d404b80ac405bd3969f5c07f (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/qml/qqmlimport.cpp
Change-Id: I6add6267297ea50a646d43d212027a168dca8916
Diffstat (limited to 'src/qml/compiler/qv4compilercontext_p.h')
| -rw-r--r-- | src/qml/compiler/qv4compilercontext_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4compilercontext_p.h b/src/qml/compiler/qv4compilercontext_p.h index cb20ea9d57..57ef4be36e 100644 --- a/src/qml/compiler/qv4compilercontext_p.h +++ b/src/qml/compiler/qv4compilercontext_p.h @@ -217,7 +217,6 @@ struct Context { bool usesThis = false; bool innerFunctionAccessesThis = false; bool innerFunctionAccessesNewTarget = false; - bool hasTry = false; bool returnsClosure = false; mutable bool argumentsCanEscape = false; bool requiresExecutionContext = false; |