diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-04-27 07:23:31 -0700 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-04-29 13:09:48 +0200 |
| commit | c1dccd6815bf545270277adb28481dba44046d21 (patch) | |
| tree | 31d4b6863328816a7b11e950ae171732ed1321f9 /src/qml/qml/qqmlboundsignal.cpp | |
| parent | 7c4159556945117ef57c5021eca12b6f96a969cc (diff) | |
Fix conversion of values to QStrings
Implement proper conversion to a QString without requiring an
ExecutionContext.
Change-Id: I6bcd3bcad0a32c483cea79ec1e1abac3b04d39e7
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlboundsignal.cpp')
| -rw-r--r-- | src/qml/qml/qqmlboundsignal.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp index 7ee21a79e4..ef869cd986 100644 --- a/src/qml/qml/qqmlboundsignal.cpp +++ b/src/qml/qml/qqmlboundsignal.cpp @@ -55,6 +55,8 @@ #include <private/qv8debugservice_p.h> #include "qqmlinfo.h" +#include <private/qv4value_p.h> + #include <QtCore/qstringbuilder.h> #include <QtCore/qdebug.h> @@ -140,7 +142,7 @@ QString QQmlBoundSignalExpression::expression() const Q_ASSERT (context() && engine()); v8::HandleScope handle_scope; v8::Context::Scope context_scope(QQmlEnginePrivate::get(engine())->v8engine()->context()); - return QV8Engine::toStringStatic(m_v8function->ToString()); + return m_v8function->v4Value().toQString(); } else if (!m_expressionUtf8.isEmpty()) { return QString::fromUtf8(m_expressionUtf8); } else { |