diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:50:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:52:26 +0200 |
| commit | 86699cbccaa044adfd36a14453de8e5c0cefc226 (patch) | |
| tree | ea5662ef8746842a765612f45a9f48f25b9c5d6a /src/qml/compiler/qv4codegen_p.h | |
| parent | 2bcfb322df727abf96022830077d4ae8b30f644d (diff) | |
| parent | 10095542d16fc9f5b2c585abf72fe00be9debff3 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/3rdparty/masm/yarr/YarrJIT.h
src/quick/items/qquickwindow.cpp
Change-Id: I551404e1558d56c0b0626346ad1c86406bff0ec7
Diffstat (limited to 'src/qml/compiler/qv4codegen_p.h')
| -rw-r--r-- | src/qml/compiler/qv4codegen_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h index c25e386131..49607256f9 100644 --- a/src/qml/compiler/qv4codegen_p.h +++ b/src/qml/compiler/qv4codegen_p.h @@ -206,6 +206,10 @@ public: bool isValid() const { return type != Invalid; } bool loadTriggersSideEffect() const { switch (type) { + case QmlScopeObject: + return capturePolicy != DontCapture; + case QmlContextObject: + return capturePolicy != DontCapture; case Name: case Member: case Subscript: |