diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-10-17 08:56:51 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-19 14:59:11 +0200 |
commit | 9fd4591a61df467362fa2f17cc2d506efd6bece3 (patch) | |
tree | fa3c31cffcd67943ae26823ab9d2b8370815980f /src/qml/qml/qqmljavascriptexpression.cpp | |
parent | f0eaaef4aeb6fa8951cca1e1e90def3411896e9f (diff) |
Remove internal method from public API
QQmlError is public API and shouldn't expose an internal
method.
Change-Id: I7caf06af9340fefec5c96103395fe74acbf19497
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
-rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index 8751d9c500..37a9e398f8 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -86,7 +86,7 @@ void QQmlDelayedError::setErrorObject(QObject *object) void QQmlDelayedError::catchJavaScriptException(QV4::ExecutionContext *context) { - m_error = QQmlError::catchJavaScriptException(context); + m_error = QV4::ExecutionEngine::convertJavaScriptException(context); } @@ -306,7 +306,7 @@ QQmlJavaScriptExpression::evalFunction(QQmlContextData *ctxt, QObject *scopeObje script.parse(); result = script.run(); } catch (...) { - QQmlError error = QQmlError::catchJavaScriptException(ctx); + QQmlError error = QV4::ExecutionEngine::convertJavaScriptException(ctx); if (error.description().isEmpty()) error.setDescription(QLatin1String("Exception occurred during function evaluation")); if (error.line() == -1) @@ -340,7 +340,7 @@ QV4::ReturnedValue QQmlJavaScriptExpression::qmlBinding(QQmlContextData *ctxt, Q script.parse(); result = script.qmlBinding(); } catch (...) { - QQmlError error = QQmlError::catchJavaScriptException(ctx); + QQmlError error = QV4::ExecutionEngine::convertJavaScriptException(ctx); if (error.description().isEmpty()) error.setDescription(QLatin1String("Exception occurred during function evaluation")); if (error.line() == -1) |