Don't leak QQmlJavaScriptExpression errors

Ensure any error is deleted when the expression is Change-Id: Ibbfd28f50279d4c66830b40c5c917eb8d98f266e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
qt · Jun 16, 2017 · 1e06851 · 1e06851
1 parent 3fc212f
commit 1e06851
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp
@@ -202,7 +202,6 @@ QQmlExpression::QQmlExpression(QQmlContextData *ctxt, QObject *scope,
 */
 QQmlExpression::~QQmlExpression()
 {
- clearError();
 }
 
 /*!

diff --git 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;