diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-12 18:15:52 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-13 09:19:18 +0200 |
| commit | 6e6079031cf44149be4ca1f05547b4c03e505290 (patch) | |
| tree | d16fb11a3cdb50f367fea645359538523ab83620 /src/qml/qml/qqmljavascriptexpression.cpp | |
| parent | 38d2d6ede6722b0fb86ee6723bbfbb2b063c4d6b (diff) | |
| parent | 8ca22ca7eb5216513410651411fd2e0f07e50f34 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: If33197b616de3476811f0161d4ecd8e7d004756c
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index 15d0a571a5..069dadd1c9 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -40,7 +40,7 @@ #include "qqmljavascriptexpression_p.h" #include <private/qqmlexpression_p.h> -#include <private/qqmlcontextwrapper_p.h> +#include <private/qv4context_p.h> #include <private/qv4value_p.h> #include <private/qv4functionobject_p.h> #include <private/qv4script_p.h> @@ -336,14 +336,6 @@ void QQmlPropertyCapture::registerQmlDependencies(QV4::ExecutionEngine *engine, } - -void QQmlJavaScriptExpression::clearError() -{ - if (m_error) - delete m_error; - m_error = 0; -} - QQmlError QQmlJavaScriptExpression::error(QQmlEngine *engine) const { Q_UNUSED(engine); |