diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-26 12:04:52 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-28 13:33:46 +0200 |
| commit | d2e2a5b59c617e6cf7236cf36e9c20fe9ea36fdb (patch) | |
| tree | 1fc21beff4add85e68a61b7c88b5d5f928bec6e8 /src/qml/jsruntime/qv4value_def_p.h | |
| parent | 18d4794e3f614eec8594f6636d569af8bc112618 (diff) | |
Remove Value::fromString()
replaced with call to the GC safe ExceutionEngine::newString()
method.
Change-Id: I7258296e75ca724ff42b94a0d147bc33a05f8f68
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4value_def_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4value_def_p.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4value_def_p.h b/src/qml/jsruntime/qv4value_def_p.h index b10a412555..bc73a85e04 100644 --- a/src/qml/jsruntime/qv4value_def_p.h +++ b/src/qml/jsruntime/qv4value_def_p.h @@ -277,11 +277,6 @@ struct Q_QML_EXPORT Value static Value fromObject(Object *o); static Value fromManaged(Managed *o); -#ifndef QMLJS_LLVM_RUNTIME - static Value fromString(ExecutionContext *ctx, const QString &fromString); - static Value fromString(ExecutionEngine *engine, const QString &s); -#endif - int toUInt16() const; int toInt32() const; unsigned int toUInt32() const; @@ -324,6 +319,8 @@ struct Q_QML_EXPORT Value ReturnedValue asReturnedValue() const { return val; } static Value fromReturnedValue(ReturnedValue val) { Value v; v.val = val; return v; } Value &operator=(ReturnedValue v) { val = v; return *this; } + template <typename T> + inline Value &operator=(Returned<T> *t); // Section 9.12 bool sameValue(Value other) const; |