diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-06-19 08:20:16 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-06-19 08:20:16 +0200 |
| commit | 7d28940a316128c8ee43def83a71843711d702c9 (patch) | |
| tree | 613537bedaeccae8711cb2009614c8f617374adf /src/qml/qml/qqmljavascriptexpression.cpp | |
| parent | 4199572d64d46bfa2efdcf7c910e81e5b8fb5547 (diff) | |
| parent | 1e0685136d0debb2a3b62d9f4650c95afe41913b (diff) | |
Merge 5.9 into 5.9.1
Change-Id: I4154bf5f6f0b74176e333541372511d47d408546
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index 17cccc0bbd..9d4e46e254 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -111,6 +111,7 @@ QQmlJavaScriptExpression::~QQmlJavaScriptExpression() clearActiveGuards(); clearPermanentGuards(); + clearError(); if (m_scopeObject.isT2()) // notify DeleteWatcher of our deletion. m_scopeObject.asT2()->_s = 0; |