diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-12-07 15:21:15 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-12-07 15:21:15 +0100 |
| commit | 48591ce7dc00ec2c00ec3983a9572398fbd794b8 (patch) | |
| tree | 304d40ab40e181aac8fe4e49e4ab9f274c52c1d9 /src/qml/jsruntime | |
| parent | b4ccdf004af8ab5b9e327abf7f87d0bd34ee13c0 (diff) | |
| parent | e0a3c6276a257aeb1cb3ef6d16a4dddcc65d8195 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: I19804e880005c66880eeabfaebf0b1093de80e6b
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4runtimeapi_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4runtimeapi_p.h b/src/qml/jsruntime/qv4runtimeapi_p.h index e06a3f5ec2..355b7890b6 100644 --- a/src/qml/jsruntime/qv4runtimeapi_p.h +++ b/src/qml/jsruntime/qv4runtimeapi_p.h @@ -63,6 +63,11 @@ template <typename T> struct ExceptionCheck { enum { NeedsCheck = 1 }; }; +// push_catch and pop context methods shouldn't check for exceptions +template <> +struct ExceptionCheck<void (*)(QV4::NoThrowEngine *)> { + enum { NeedsCheck = 0 }; +}; template <typename A> struct ExceptionCheck<void (*)(A, QV4::NoThrowEngine)> { enum { NeedsCheck = 0 }; |