diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-11 13:55:01 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:13:18 +0200 |
| commit | 1a2a83f80ba4ecc28eba72af57c81bd43a45946c (patch) | |
| tree | c2e4eb4d9bb57873ca340f6bbbf2342b36c91452 /src/qml/jsruntime/qv4value.cpp | |
| parent | 826550af450b39f47a3c00ec316acf1e317f12c6 (diff) | |
Use a ReturnedValue for Managed::call()
Change-Id: Ief2d75e9789dd367c603d90dc0fe5316a0d055e3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4value.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4value.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4value.cpp b/src/qml/jsruntime/qv4value.cpp index 0347188ae0..6a717cde8d 100644 --- a/src/qml/jsruntime/qv4value.cpp +++ b/src/qml/jsruntime/qv4value.cpp @@ -327,6 +327,11 @@ PersistentValue::PersistentValue(const Value &val) { } +PersistentValue::PersistentValue(ReturnedValue val) + : d(new PersistentValuePrivate(Value::fromReturnedValue(val))) +{ +} + PersistentValue::PersistentValue(const PersistentValue &other) : d(other.d) { @@ -360,6 +365,16 @@ PersistentValue &PersistentValue::operator =(const Value &other) return *this; } +PersistentValue &PersistentValue::operator =(const ReturnedValue &other) +{ + if (!d) { + d = new PersistentValuePrivate(Value::fromReturnedValue(other)); + return *this; + } + d = d->detach(Value::fromReturnedValue(other)); + return *this; +} + PersistentValue::~PersistentValue() { if (d) |