aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsapi/qjsvalue_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/jsapi/qjsvalue_p.h')
-rw-r--r--src/qml/jsapi/qjsvalue_p.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/qml/jsapi/qjsvalue_p.h b/src/qml/jsapi/qjsvalue_p.h
index a0dfa010ab..ec3f61ef20 100644
--- a/src/qml/jsapi/qjsvalue_p.h
+++ b/src/qml/jsapi/qjsvalue_p.h
@@ -69,19 +69,18 @@ QT_BEGIN_NAMESPACE
class Q_QML_PRIVATE_EXPORT QJSValuePrivate : public QV4::PersistentValuePrivate
{
public:
- QJSValuePrivate(QV4::ExecutionEngine *engine, const QV4::Value &v)
- : PersistentValuePrivate(v, engine)
+ QJSValuePrivate(QV4::ExecutionEngine *engine, const QV4::ValueRef v)
+ : PersistentValuePrivate(v.asReturnedValue(), engine)
+ {
+ Q_ASSERT(!value.isEmpty());
+ }
+ QJSValuePrivate(QV4::ReturnedValue v)
+ : PersistentValuePrivate(v)
{
Q_ASSERT(!value.isEmpty());
}
- QJSValuePrivate(QV4::Object *o)
- : PersistentValuePrivate(QV4::Value::fromObject(o))
- { }
- QJSValuePrivate(QV4::String *s)
- : PersistentValuePrivate(QV4::Value::fromString(s))
- { }
QJSValuePrivate(const QString &s)
- : PersistentValuePrivate(QV4::Value::undefinedValue())
+ : PersistentValuePrivate(QV4::Encode::undefined())
, string(0, s)
{
value = QV4::Value::fromString(&string);