From: Simon Hausmann <simon.hausmann@digia.com>
Date: Tue, 7 May 2013 07:54:05 +0000 (+0200)
Subject: Replace v8::Undefined() with QV4::Value::undefinedValue()
X-Git-Tag: upstream/5.2.1~669^2~549
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1abed74e211585ef9d8aab46ab924a212860c5fe;p=platform%2Fupstream%2Fqtdeclarative.git

Replace v8::Undefined() with QV4::Value::undefinedValue()

Change-Id: I4c7bb5bcc1bc15a982bb83d2597e6ae4bc5710cd
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---

diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp
index 6e96c68..d1aaafc 100644
--- a/src/imports/localstorage/plugin.cpp
+++ b/src/imports/localstorage/plugin.cpp
@@ -208,7 +208,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_rows_index(QV8SqlDatabaseResource *r
         }
         return row;
     } else {
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     }
 }
 
@@ -252,7 +252,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_executeSql(const v8::Arguments& args
     QSqlQuery query(db);
     bool err = false;
 
-    v8::Handle<v8::Value> result = v8::Undefined();
+    v8::Handle<v8::Value> result = QV4::Value::undefinedValue();
 
     if (query.prepare(sql)) {
         if (args.Length() > 1) {
@@ -302,7 +302,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_executeSql(const v8::Arguments& args
 static v8::Handle<v8::Value> qmlsqldatabase_changeVersion(const v8::Arguments& args)
 {
     if (args.Length() < 2)
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     QV8SqlDatabaseResource *r = v8_resource_cast<QV8SqlDatabaseResource>(args.This());
     if (!r || r->type != QV8SqlDatabaseResource::Database)
@@ -357,7 +357,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_changeVersion(const v8::Arguments& a
 #endif
     }
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 static v8::Handle<v8::Value> qmlsqldatabase_transaction_shared(const v8::Arguments& args, bool readOnly)
@@ -397,7 +397,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_transaction_shared(const v8::Argumen
         db.rollback();
     }
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 static v8::Handle<v8::Value> qmlsqldatabase_transaction(const v8::Arguments& args)
diff --git a/src/particles/qquickv8particledata.cpp b/src/particles/qquickv8particledata.cpp
index 674a09f..3ca8820 100644
--- a/src/particles/qquickv8particledata.cpp
+++ b/src/particles/qquickv8particledata.cpp
@@ -294,7 +294,7 @@ static v8::Handle<v8::Value> particleData_discard(const v8::Arguments &args)
         V8THROW_ERROR("Not a valid ParticleData object");
 
     r->datum->lifeSpan = 0; //Don't kill(), because it could still be in the middle of being created
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 static v8::Handle<v8::Value> particleData_lifeLeft(const v8::Arguments &args)
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index 75da534..6709ea6 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1416,7 +1416,7 @@ v8::Handle<v8::Value> QV8IncubatorResource::ForceCompletion(const v8::Arguments
 
     r->forceCompletion();
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> QV8IncubatorResource::StatusGetter(v8::Handle<v8::String>,
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index 0d50977..cd3b40b 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -164,10 +164,10 @@ void QQmlDateExtension::registerExtension(QV8Engine *engine)
 v8::Handle<v8::Value> QQmlDateExtension::toLocaleString(const v8::Arguments& args)
 {
     if (args.Length() > 2)
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     if (!args.This()->IsDate())
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     QDateTime dt = QV8Engine::qtDateTimeFromJsDate(v8::Handle<v8::Date>::Cast(args.This())->NumberValue());
 
@@ -178,7 +178,7 @@ v8::Handle<v8::Value> QQmlDateExtension::toLocaleString(const v8::Arguments& arg
     }
 
     if (!isLocaleObject(args[0]))
-        return v8::Undefined(); // Use the default Date toLocaleString()
+        return QV4::Value::undefinedValue(); // Use the default Date toLocaleString()
 
     GET_LOCALE_DATA_RESOURCE(args[0]->ToObject());
 
@@ -205,10 +205,10 @@ v8::Handle<v8::Value> QQmlDateExtension::toLocaleString(const v8::Arguments& arg
 v8::Handle<v8::Value> QQmlDateExtension::toLocaleTimeString(const v8::Arguments& args)
 {
     if (args.Length() > 2)
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     if (!args.This()->IsDate())
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     QDateTime dt = QV8Engine::qtDateTimeFromJsDate(v8::Handle<v8::Date>::Cast(args.This())->NumberValue());
     QTime time = dt.time();
@@ -220,7 +220,7 @@ v8::Handle<v8::Value> QQmlDateExtension::toLocaleTimeString(const v8::Arguments&
     }
 
     if (!isLocaleObject(args[0]))
-        return v8::Undefined(); // Use the default Date toLocaleTimeString()
+        return QV4::Value::undefinedValue(); // Use the default Date toLocaleTimeString()
 
     GET_LOCALE_DATA_RESOURCE(args[0]->ToObject());
 
@@ -247,10 +247,10 @@ v8::Handle<v8::Value> QQmlDateExtension::toLocaleTimeString(const v8::Arguments&
 v8::Handle<v8::Value> QQmlDateExtension::toLocaleDateString(const v8::Arguments& args)
 {
     if (args.Length() > 2)
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     if (!args.This()->IsDate())
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     QDateTime dt = QV8Engine::qtDateTimeFromJsDate(v8::Handle<v8::Date>::Cast(args.This())->NumberValue());
     QDate date = dt.date();
@@ -262,7 +262,7 @@ v8::Handle<v8::Value> QQmlDateExtension::toLocaleDateString(const v8::Arguments&
     }
 
     if (!isLocaleObject(args[0]))
-        return v8::Undefined(); // Use the default Date toLocaleDateString()
+        return QV4::Value::undefinedValue(); // Use the default Date toLocaleDateString()
 
     GET_LOCALE_DATA_RESOURCE(args[0]->ToObject());
 
@@ -408,7 +408,7 @@ v8::Handle<v8::Value> QQmlDateExtension::timeZoneUpdated(const v8::Arguments& ar
 
     v8::Date::DateTimeConfigurationChangeNotification();
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 //-----------------
@@ -461,7 +461,7 @@ v8::Handle<v8::Value> QQmlNumberExtension::toLocaleString(const v8::Arguments& a
     }
 
     if (!isLocaleObject(args[0]))
-        return v8::Undefined(); // Use the default Number toLocaleString()
+        return QV4::Value::undefinedValue(); // Use the default Number toLocaleString()
 
     GET_LOCALE_DATA_RESOURCE(args[0]->ToObject());
 
@@ -904,10 +904,10 @@ void QQmlLocale::registerStringLocaleCompare(QV8Engine *engine)
 v8::Handle<v8::Value> QQmlLocale::localeCompare(const v8::Arguments &args)
 {
     if (args.Length() != 1 || (!args[0]->IsString() && !args[0]->IsStringObject()))
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     if (!args.This()->IsString() && !args.This()->IsStringObject())
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     QString thisString = args.This()->v4Value().toString(args.GetIsolate()->GetEngine()->current)->toQString();
     QString thatString = args[0]->v4Value().toString(args.GetIsolate()->GetEngine()->current)->toQString();
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index ac57833..a28e96e 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -363,7 +363,7 @@ void NodeImpl::release()
 v8::Handle<v8::Value> Node::nodeName(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     switch (r->d->type) {
@@ -381,7 +381,7 @@ v8::Handle<v8::Value> Node::nodeName(v8::Handle<v8::String>, const v8::AccessorI
 v8::Handle<v8::Value> Node::nodeValue(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     if (r->d->type == NodeImpl::Document ||
@@ -399,14 +399,14 @@ v8::Handle<v8::Value> Node::nodeValue(v8::Handle<v8::String>, const v8::Accessor
 v8::Handle<v8::Value> Node::nodeType(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     return v8::Integer::New(r->d->type);
 }
 
 v8::Handle<v8::Value> Node::parentNode(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     if (r->d->parent) return Node::create(engine, r->d->parent);
@@ -416,7 +416,7 @@ v8::Handle<v8::Value> Node::parentNode(v8::Handle<v8::String>, const v8::Accesso
 v8::Handle<v8::Value> Node::childNodes(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     return NodeList::create(engine, r->d);
@@ -425,7 +425,7 @@ v8::Handle<v8::Value> Node::childNodes(v8::Handle<v8::String>, const v8::Accesso
 v8::Handle<v8::Value> Node::firstChild(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     if (r->d->children.isEmpty()) return v8::Null();
@@ -435,7 +435,7 @@ v8::Handle<v8::Value> Node::firstChild(v8::Handle<v8::String>, const v8::Accesso
 v8::Handle<v8::Value> Node::lastChild(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     if (r->d->children.isEmpty()) return v8::Null();
@@ -445,7 +445,7 @@ v8::Handle<v8::Value> Node::lastChild(v8::Handle<v8::String>, const v8::Accessor
 v8::Handle<v8::Value> Node::previousSibling(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     if (!r->d->parent) return v8::Null();
@@ -463,7 +463,7 @@ v8::Handle<v8::Value> Node::previousSibling(v8::Handle<v8::String>, const v8::Ac
 v8::Handle<v8::Value> Node::nextSibling(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     if (!r->d->parent) return v8::Null();
@@ -481,7 +481,7 @@ v8::Handle<v8::Value> Node::nextSibling(v8::Handle<v8::String>, const v8::Access
 v8::Handle<v8::Value> Node::attributes(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     if (r->d->type != NodeImpl::Element)
@@ -537,7 +537,7 @@ v8::Handle<v8::Value> Node::create(QV8Engine *engine, NodeImpl *data)
     case NodeImpl::EntityReference:
     case NodeImpl::Notation:
     case NodeImpl::ProcessingInstruction:
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     case NodeImpl::CDATA:
         instance->SetPrototype(CDATA::prototype(engine));
         break;
@@ -590,7 +590,7 @@ v8::Handle<v8::Object> Attr::prototype(QV8Engine *engine)
 v8::Handle<v8::Value> Attr::name(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     return engine->toString(r->d->name);
@@ -599,7 +599,7 @@ v8::Handle<v8::Value> Attr::name(v8::Handle<v8::String>, const v8::AccessorInfo
 v8::Handle<v8::Value> Attr::value(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     return engine->toString(r->d->data);
@@ -608,7 +608,7 @@ v8::Handle<v8::Value> Attr::value(v8::Handle<v8::String>, const v8::AccessorInfo
 v8::Handle<v8::Value> Attr::ownerElement(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     return Node::create(engine, r->d->parent);
@@ -617,7 +617,7 @@ v8::Handle<v8::Value> Attr::ownerElement(v8::Handle<v8::String>, const v8::Acces
 v8::Handle<v8::Value> CharacterData::length(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
     Q_UNUSED(engine)
     return v8::Integer::New(r->d->data.length());
@@ -641,7 +641,7 @@ v8::Handle<v8::Object> CharacterData::prototype(QV8Engine *engine)
 v8::Handle<v8::Value> Text::isElementContentWhitespace(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
     Q_UNUSED(engine)
     return v8::Boolean::New(r->d->data.trimmed().isEmpty());
@@ -650,7 +650,7 @@ v8::Handle<v8::Value> Text::isElementContentWhitespace(v8::Handle<v8::String>, c
 v8::Handle<v8::Value> Text::wholeText(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     return engine->toString(r->d->data);
@@ -814,7 +814,7 @@ bool Node::isNull() const
 v8::Handle<v8::Value> NamedNodeMap::length(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
     Q_UNUSED(engine)
     return v8::Integer::New(r->list->count());
@@ -823,20 +823,20 @@ v8::Handle<v8::Value> NamedNodeMap::length(v8::Handle<v8::String>, const v8::Acc
 v8::Handle<v8::Value> NamedNodeMap::indexed(uint32_t index, const v8::AccessorInfo& args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r || !r->list) return v8::Undefined();
+    if (!r || !r->list) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     if ((int)index < r->list->count()) {
         return Node::create(engine, r->list->at(index));
     } else {
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     }
 }
 
 v8::Handle<v8::Value> NamedNodeMap::named(v8::Handle<v8::String> property, const v8::AccessorInfo& args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r || !r->list) return v8::Undefined();
+    if (!r || !r->list) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     QString str = property->v4Value().toQString();
@@ -846,7 +846,7 @@ v8::Handle<v8::Value> NamedNodeMap::named(v8::Handle<v8::String> property, const
         }
     }
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Object> NamedNodeMap::prototype(QV8Engine *engine)
@@ -879,20 +879,20 @@ v8::Handle<v8::Value> NamedNodeMap::create(QV8Engine *engine, NodeImpl *data, QL
 v8::Handle<v8::Value> NodeList::indexed(uint32_t index, const v8::AccessorInfo& args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     if ((int)index < r->d->children.count()) {
         return Node::create(engine, r->d->children.at(index));
     } else {
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     }
 }
 
 v8::Handle<v8::Value> NodeList::length(v8::Handle<v8::String>, const v8::AccessorInfo& args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r) return v8::Undefined();
+    if (!r) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
     Q_UNUSED(engine)
     return v8::Integer::New(r->d->children.count());
@@ -926,7 +926,7 @@ v8::Handle<v8::Value> NodeList::create(QV8Engine *engine, NodeImpl *data)
 v8::Handle<v8::Value> Document::documentElement(v8::Handle<v8::String>, const v8::AccessorInfo& args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r || r->d->type != NodeImpl::Document) return v8::Undefined();
+    if (!r || r->d->type != NodeImpl::Document) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     return Node::create(engine, static_cast<DocumentImpl *>(r->d)->root);
@@ -935,7 +935,7 @@ v8::Handle<v8::Value> Document::documentElement(v8::Handle<v8::String>, const v8
 v8::Handle<v8::Value> Document::xmlStandalone(v8::Handle<v8::String>, const v8::AccessorInfo& args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r || r->d->type != NodeImpl::Document) return v8::Undefined();
+    if (!r || r->d->type != NodeImpl::Document) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
     Q_UNUSED(engine)
     return v8::Boolean::New(static_cast<DocumentImpl *>(r->d)->isStandalone);
@@ -944,7 +944,7 @@ v8::Handle<v8::Value> Document::xmlStandalone(v8::Handle<v8::String>, const v8::
 v8::Handle<v8::Value> Document::xmlVersion(v8::Handle<v8::String>, const v8::AccessorInfo& args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r || r->d->type != NodeImpl::Document) return v8::Undefined();
+    if (!r || r->d->type != NodeImpl::Document) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     return engine->toString(static_cast<DocumentImpl *>(r->d)->version);
@@ -953,7 +953,7 @@ v8::Handle<v8::Value> Document::xmlVersion(v8::Handle<v8::String>, const v8::Acc
 v8::Handle<v8::Value> Document::xmlEncoding(v8::Handle<v8::String>, const v8::AccessorInfo& args)
 {
     QQmlDOMNodeResource *r = v8_resource_cast<QQmlDOMNodeResource>(args.This());
-    if (!r || r->d->type != NodeImpl::Document) return v8::Undefined();
+    if (!r || r->d->type != NodeImpl::Document) return QV4::Value::undefinedValue();
     QV8Engine *engine = V8ENGINE();
 
     return engine->toString(static_cast<DocumentImpl *>(r->d)->encoding);
@@ -1086,7 +1086,7 @@ v8::Handle<v8::Value> QQmlXMLHttpRequest::open(v8::Handle<v8::Object> me, const
     v8::TryCatch tc;
     dispatchCallback(me);
     if (tc.HasCaught()) printError(tc.Message());
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 void QQmlXMLHttpRequest::addHeader(const QString &name, const QString &value)
@@ -1210,7 +1210,7 @@ v8::Handle<v8::Value> QQmlXMLHttpRequest::send(v8::Handle<v8::Object> me, const
 
     requestFromUrl(m_url);
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> QQmlXMLHttpRequest::abort(v8::Handle<v8::Object> me)
@@ -1233,7 +1233,7 @@ v8::Handle<v8::Value> QQmlXMLHttpRequest::abort(v8::Handle<v8::Object> me)
 
     m_state = Unsent;
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Object> QQmlXMLHttpRequest::getMe() const
@@ -1598,11 +1598,11 @@ static v8::Handle<v8::Value> qmlxmlhttprequest_setRequestHeader(const v8::Argume
         nameUpper == QLatin1String("VIA") ||
         nameUpper.startsWith(QLatin1String("PROXY-")) ||
         nameUpper.startsWith(QLatin1String("SEC-"))) 
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     r->addHeader(name, value);
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 static v8::Handle<v8::Value> qmlxmlhttprequest_send(const v8::Arguments &args)
@@ -1761,7 +1761,7 @@ static v8::Handle<v8::Value> qmlxmlhttprequest_new(const v8::Arguments &args)
 
         return args.This();
     } else {
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     }
 }
 
diff --git a/src/qml/qml/v4/qv4v8.cpp b/src/qml/qml/v4/qv4v8.cpp
index 1612182..a7e8436 100644
--- a/src/qml/qml/v4/qv4v8.cpp
+++ b/src/qml/qml/v4/qv4v8.cpp
@@ -1822,13 +1822,6 @@ ObjectTemplate::ObjectTemplate()
     m_useUserComparison = false;
 }
 
-Handle<Primitive> Undefined()
-{
-    Handle<Primitive> val;
-    val.val = QV4::Value::undefinedValue().val;
-    return val;
-}
-
 Handle<Primitive> Null()
 {
     Handle<Primitive> val;
diff --git a/src/qml/qml/v4/qv4v8_p.h b/src/qml/qml/v4/qv4v8_p.h
index b3979cd..3f10d2f 100644
--- a/src/qml/qml/v4/qv4v8_p.h
+++ b/src/qml/qml/v4/qv4v8_p.h
@@ -2022,7 +2022,6 @@ DEFINE_REFCOUNTED_HANDLE_OPERATIONS(ObjectTemplate)
 // --- Statics ---
 
 
-Handle<Primitive> V8EXPORT Undefined();
 Handle<Primitive> V8EXPORT Null();
 Handle<Boolean> V8EXPORT True();
 Handle<Boolean> V8EXPORT False();
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 6367250..a02ecf5 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -170,7 +170,7 @@ v8::Handle<v8::Value> console(ConsoleLogTypes logType, const v8::Arguments &args
         break;
     }
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> gc(const v8::Arguments &args)
@@ -178,7 +178,7 @@ v8::Handle<v8::Value> gc(const v8::Arguments &args)
     Q_UNUSED(args);
     // ###
 //    QV8Engine::gc();
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> consoleError(const v8::Arguments &args)
@@ -221,7 +221,7 @@ v8::Handle<v8::Value> consoleProfile(const v8::Arguments &args)
                     "Profiling is already in progress. First, end current profiling session.");
     }
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> consoleProfileEnd(const v8::Arguments &args)
@@ -250,7 +250,7 @@ v8::Handle<v8::Value> consoleProfileEnd(const v8::Arguments &args)
                        *v8::String::AsciiValue(function)).warning("Profiling was not started.");
     }
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> consoleTime(const v8::Arguments &args)
@@ -259,7 +259,7 @@ v8::Handle<v8::Value> consoleTime(const v8::Arguments &args)
         V8THROW_ERROR("console.time(): Invalid arguments");
     QString name = args[0]->v4Value().toQString();
     V8ENGINE()->startTimer(name);
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> consoleTimeEnd(const v8::Arguments &args)
@@ -272,7 +272,7 @@ v8::Handle<v8::Value> consoleTimeEnd(const v8::Arguments &args)
     if (wasRunning) {
         qDebug("%s: %llims", qPrintable(name), elapsed);
     }
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> consoleCount(const v8::Arguments &args)
@@ -300,7 +300,7 @@ v8::Handle<v8::Value> consoleCount(const v8::Arguments &args)
                        qPrintable(functionName)).debug("%s", qPrintable(message));
     }
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> consoleTrace(const v8::Arguments &args)
@@ -317,7 +317,7 @@ v8::Handle<v8::Value> consoleTrace(const v8::Arguments &args)
 
     QMessageLogger(*v8::String::AsciiValue(file), line, *v8::String::AsciiValue(function)).debug(
                 "%s", qPrintable(stack));
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> consoleWarn(const v8::Arguments &args)
@@ -351,7 +351,7 @@ v8::Handle<v8::Value> consoleAssert(const v8::Arguments &args)
                     "%s\n%s", qPrintable(message), qPrintable(stack));
 
     }
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> consoleException(const v8::Arguments &args)
@@ -361,7 +361,7 @@ v8::Handle<v8::Value> consoleException(const v8::Arguments &args)
 
     console(Error, args, true);
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> stringArg(const v8::Arguments &args)
@@ -1113,7 +1113,7 @@ QQmlEngine::quit() signal to the QCoreApplication::quit() slot.
 v8::Handle<v8::Value> quit(const v8::Arguments &args)
 {
     QQmlEnginePrivate::get(V8ENGINE()->engine())->sendQuit();
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 /*!
@@ -1201,7 +1201,7 @@ v8::Handle<v8::Value> createQmlObject(const v8::Arguments &args)
 
     if (component.isError()) {
         v8::ThrowException(Error::create(v8engine, component.errors()));
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     }
 
     if (!component.isReady())
@@ -1225,7 +1225,7 @@ v8::Handle<v8::Value> createQmlObject(const v8::Arguments &args)
 
     if (component.isError()) {
         v8::ThrowException(Error::create(v8engine, component.errors()));
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     }
 
     Q_ASSERT(obj);
@@ -1404,7 +1404,7 @@ v8::Handle<v8::Value> qsTranslate(const v8::Arguments &args)
 v8::Handle<v8::Value> qsTranslateNoOp(const v8::Arguments &args)
 {
     if (args.Length() < 2)
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     return args[1];
 }
 
@@ -1482,7 +1482,7 @@ v8::Handle<v8::Value> qsTr(const v8::Arguments &args)
 v8::Handle<v8::Value> qsTrNoOp(const v8::Arguments &args)
 {
     if (args.Length() < 1)
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     return args[0];
 }
 
@@ -1552,7 +1552,7 @@ v8::Handle<v8::Value> qsTrId(const v8::Arguments &args)
 v8::Handle<v8::Value> qsTrIdNoOp(const v8::Arguments &args)
 {
     if (args.Length() < 1)
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     return args[0];
 }
 #endif // QT_NO_TRANSLATION
diff --git a/src/qml/qml/v8/qv8contextwrapper.cpp b/src/qml/qml/v8/qv8contextwrapper.cpp
index 5e84082..e366650 100644
--- a/src/qml/qml/v8/qv8contextwrapper.cpp
+++ b/src/qml/qml/v8/qv8contextwrapper.cpp
@@ -255,7 +255,7 @@ v8::Handle<v8::Value> QV8ContextWrapper::Getter(v8::Handle<v8::String> property,
     QQmlContextData *expressionContext = context;
 
     if (!context)
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     if (info.GetIsolate()->GetEngine()->qmlContextObject() != info.This()->v4Value().asObject())
         return v8::Handle<v8::Value>();
@@ -284,7 +284,7 @@ v8::Handle<v8::Value> QV8ContextWrapper::Getter(v8::Handle<v8::String> property,
                 if (index < context->importedScripts.count())
                     return context->importedScripts.at(index);
                 else
-                    return v8::Undefined();
+                    return QV4::Value::undefinedValue();
             } else if (r.type) {
                 return engine->typeWrapper()->newObject(scopeObject, r.type);
             } else if (r.importNamespace) {
@@ -385,7 +385,7 @@ v8::Handle<v8::Value> QV8ContextWrapper::Setter(v8::Handle<v8::String> property,
     QQmlContextData *expressionContext = context;
 
     if (!context)
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     if (info.GetIsolate()->GetEngine()->qmlContextObject() != info.This()->v4Value().asObject())
         return v8::Handle<v8::Value>();
@@ -427,7 +427,7 @@ v8::Handle<v8::Value> QV8ContextWrapper::Setter(v8::Handle<v8::String> property,
         QString error = QLatin1String("Invalid write to global property \"") + property->v4Value().toQString() +
                         QLatin1Char('"');
         v8::ThrowException(v8::Exception::Error(engine->toString(error)));
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     }
 }
 
diff --git a/src/qml/qml/v8/qv8include.cpp b/src/qml/qml/v8/qv8include.cpp
index f37ed73..92e2621 100644
--- a/src/qml/qml/v8/qv8include.cpp
+++ b/src/qml/qml/v8/qv8include.cpp
@@ -170,7 +170,7 @@ void QV8Include::finished()
 v8::Handle<v8::Value> QV8Include::include(const v8::Arguments &args)
 {
     if (args.Length() == 0)
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     QV8Engine *engine = V8ENGINE();
     QQmlContextData *context = engine->callingContext();
@@ -235,7 +235,7 @@ v8::Handle<v8::Value> QV8Include::include(const v8::Arguments &args)
     }
 
     if (result.IsEmpty())
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     else 
         return result;
 }
diff --git a/src/qml/qml/v8/qv8listwrapper.cpp b/src/qml/qml/v8/qv8listwrapper.cpp
index 37b5de7..7ad590a 100644
--- a/src/qml/qml/v8/qv8listwrapper.cpp
+++ b/src/qml/qml/v8/qv8listwrapper.cpp
@@ -151,13 +151,13 @@ v8::Handle<v8::Value> QV8ListWrapper::IndexedGetter(uint32_t index, const v8::Ac
 {
     QV8ListResource *resource = v8_resource_cast<QV8ListResource>(info.This());
 
-    if (!resource || resource->object.isNull()) return v8::Undefined();
+    if (!resource || resource->object.isNull()) return QV4::Value::undefinedValue();
 
     quint32 count = resource->property.count?resource->property.count(&resource->property):0;
     if (index < count && resource->property.at) {
         return resource->engine->newQObject(resource->property.at(&resource->property, index));
     } else {
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     }
 }
 
@@ -168,7 +168,7 @@ v8::Handle<v8::Value> QV8ListWrapper::LengthGetter(v8::Handle<v8::String> proper
 
     QV8ListResource *resource = v8_resource_cast<QV8ListResource>(info.This());
 
-    if (!resource || resource->object.isNull()) return v8::Undefined();
+    if (!resource || resource->object.isNull()) return QV4::Value::undefinedValue();
 
     quint32 count = resource->property.count?resource->property.count(&resource->property):0;
 
diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp
index f669d20..8166849 100644
--- a/src/qml/qml/v8/qv8qobjectwrapper.cpp
+++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp
@@ -275,7 +275,7 @@ static v8::Handle<v8::Value> GenericValueGetter(v8::Handle<v8::String>, const v8
     QV8QObjectResource *resource = v8_resource_check<QV8QObjectResource>(This);
 
     QObject *object = resource->object;
-    if (QQmlData::wasDeleted(object)) return v8::Undefined();
+    if (QQmlData::wasDeleted(object)) return QV4::Value::undefinedValue();
 
     QQmlPropertyData *property =
             (QQmlPropertyData *)v8::External::Cast(info.Data().get())->Value();
@@ -467,7 +467,7 @@ static v8::Handle<v8::Value> LoadProperty(QV8Engine *engine, QObject *object,
         QMetaProperty p = object->metaObject()->property(property.coreIndex);
         qWarning("QMetaProperty::read: Unable to handle unregistered datatype '%s' for property "
                  "'%s::%s'", p.typeName(), object->metaObject()->className(), p.name());
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     } else {
         QVariant v(property.propType, (void *)0);
         ReadFunction(object, property, v.data(), notifier);
@@ -773,7 +773,7 @@ v8::Handle<v8::Value> QV8QObjectWrapper::Getter(v8::Handle<v8::String> property,
 
             if (r.isValid()) {
                 if (r.scriptIndex != -1) {
-                    return v8::Undefined();
+                    return QV4::Value::undefinedValue();
                 } else if (r.type) {
                     return v8engine->typeWrapper()->newObject(object, r.type, QV8TypeWrapper::ExcludeEnums);
                 } else if (r.importNamespace) {
@@ -1099,7 +1099,7 @@ v8::Handle<v8::Value> QV8QObjectWrapper::newQObject(QObject *object)
 
     QQmlData *ddata = QQmlData::get(object, true);
     if (!ddata) 
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     if (ddata->v8objectid == m_id && !ddata->v8object.IsEmpty()) {
         // We own the v8object 
@@ -1422,7 +1422,7 @@ v8::Handle<v8::Value> QV8QObjectWrapper::Connect(const v8::Arguments &args)
 
     slotIter->append(connection);
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> QV8QObjectWrapper::Disconnect(const v8::Arguments &args)
@@ -1465,12 +1465,12 @@ v8::Handle<v8::Value> QV8QObjectWrapper::Disconnect(const v8::Arguments &args)
     QHash<QObject *, QV8QObjectConnectionList *> &connectionsList = qobjectWrapper->m_connections;
     QHash<QObject *, QV8QObjectConnectionList *>::Iterator iter = connectionsList.find(signalObject);
     if (iter == connectionsList.end()) 
-        return v8::Undefined(); // Nothing to disconnect from
+        return QV4::Value::undefinedValue(); // Nothing to disconnect from
 
     QV8QObjectConnectionList *connectionList = *iter;
     QV8QObjectConnectionList::SlotHash::Iterator slotIter = connectionList->slotHash.find(signalIndex);
     if (slotIter == connectionList->slotHash.end()) 
-        return v8::Undefined(); // Nothing to disconnect from
+        return QV4::Value::undefinedValue(); // Nothing to disconnect from
 
     QV8QObjectConnectionList::ConnectionList &connections = *slotIter;
 
@@ -1495,7 +1495,7 @@ v8::Handle<v8::Value> QV8QObjectWrapper::Disconnect(const v8::Arguments &args)
                         connection.dispose();
                         connections.removeAt(ii);
                     }
-                    return v8::Undefined();
+                    return QV4::Value::undefinedValue();
                 }
             }
         }
@@ -1515,12 +1515,12 @@ v8::Handle<v8::Value> QV8QObjectWrapper::Disconnect(const v8::Arguments &args)
                     connection.dispose();
                     connections.removeAt(ii);
                 }
-                return v8::Undefined();
+                return QV4::Value::undefinedValue();
             }
         }
     }
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 /*!
@@ -1602,7 +1602,7 @@ static v8::Handle<v8::Value> CallMethod(QObject *object, int index, int returnTy
 
         void *args[] = { 0 };
         QMetaObject::metacall(object, QMetaObject::InvokeMetaMethod, index, args);
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     }
 }
@@ -1958,7 +1958,7 @@ static v8::Handle<v8::Value> Destroy(QV8Engine *, QObject *object, int argCount,
     if (!ddata || ddata->indestructible || ddata->rootObjectInCreation) {
         const char *error = "Invalid attempt to destroy() an indestructible object";
         v8::ThrowException(v8::Exception::Error(v8::String::New(error)));
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     }
 
     int delay = 0;
@@ -1970,7 +1970,7 @@ static v8::Handle<v8::Value> Destroy(QV8Engine *, QObject *object, int argCount,
     else
         object->deleteLater();
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> QV8QObjectWrapper::Invoke(const v8::Arguments &args)
@@ -1982,7 +1982,7 @@ v8::Handle<v8::Value> QV8QObjectWrapper::Invoke(const v8::Arguments &args)
     QV8QObjectResource *resource = v8_resource_cast<QV8QObjectResource>(args[0]->ToObject());
 
     if (!resource)
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     int argCount = args[3]->Int32Value();
     v8::Handle<v8::Object> arguments = v8::Handle<v8::Object>::Cast(args[4]);
@@ -1999,7 +1999,7 @@ v8::Handle<v8::Value> QV8QObjectWrapper::Invoke(const v8::Arguments &args)
     int index = args[1]->Int32Value();
 
     if (!object)
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     if (index < 0) {
         // Builtin functions
@@ -2008,7 +2008,7 @@ v8::Handle<v8::Value> QV8QObjectWrapper::Invoke(const v8::Arguments &args)
         } else if (index == QOBJECT_DESTROY_INDEX) {
             return Destroy(resource->engine, object, argCount, arguments);
         } else {
-            return v8::Undefined();
+            return QV4::Value::undefinedValue();
         }
     }
 
@@ -2018,7 +2018,7 @@ v8::Handle<v8::Value> QV8QObjectWrapper::Invoke(const v8::Arguments &args)
         if (ddata->propertyCache) {
             QQmlPropertyData *d = ddata->propertyCache->method(index);
             if (!d) 
-                return v8::Undefined();
+                return QV4::Value::undefinedValue();
             method = *d;
         } 
     }
@@ -2027,7 +2027,7 @@ v8::Handle<v8::Value> QV8QObjectWrapper::Invoke(const v8::Arguments &args)
         method.load(object->metaObject()->method(index));
 
         if (method.coreIndex == -1)
-            return v8::Undefined();
+            return QV4::Value::undefinedValue();
     }
 
     if (method.isV8Function()) {
@@ -2042,7 +2042,7 @@ v8::Handle<v8::Value> QV8QObjectWrapper::Invoke(const v8::Arguments &args)
         void *args[] = { 0, &funcptr };
         QMetaObject::metacall(object, QMetaObject::InvokeMetaMethod, method.coreIndex, args);
 
-        if (rv.IsEmpty()) return v8::Undefined();
+        if (rv.IsEmpty()) return QV4::Value::undefinedValue();
         return rv;
     }
 
@@ -2273,7 +2273,7 @@ v8::Handle<v8::Value> CallArgument::toValue(QV8Engine *engine)
             QQmlData::get(object, true)->setImplicitDestructible();
         return rv;
     } else {
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     }
 }
 
diff --git a/src/qml/qml/v8/qv8sequencewrapper_p_p.h b/src/qml/qml/v8/qv8sequencewrapper_p_p.h
index da56fa4..c8d6142 100644
--- a/src/qml/qml/v8/qv8sequencewrapper_p_p.h
+++ b/src/qml/qml/v8/qv8sequencewrapper_p_p.h
@@ -358,11 +358,11 @@ static QString convertUrlToString(QV8Engine *, const QUrl &v)
                 /* Qt containers have int (rather than uint) allowable indexes. */ \
                 if (index > INT_MAX) { \
                     generateWarning(engine, QLatin1String("Index out of range during indexed set")); \
-                    return v8::Undefined(); \
+                    return QV4::Value::undefinedValue(); \
                 } \
                 if (objectType == QV8SequenceResource::Reference) { \
                     if (!object) \
-                        return v8::Undefined(); \
+                        return QV4::Value::undefinedValue(); \
                     loadReference(); \
                 } \
                 /* modify the sequence */ \
@@ -392,18 +392,18 @@ static QString convertUrlToString(QV8Engine *, const QUrl &v)
                 /* Qt containers have int (rather than uint) allowable indexes. */ \
                 if (index > INT_MAX) { \
                     generateWarning(engine, QLatin1String("Index out of range during indexed get")); \
-                    return v8::Undefined(); \
+                    return QV4::Value::undefinedValue(); \
                 } \
                 if (objectType == QV8SequenceResource::Reference) { \
                     if (!object) \
-                        return v8::Undefined(); \
+                        return QV4::Value::undefinedValue(); \
                     loadReference(); \
                 } \
                 qint32 count = c.count(); \
                 qint32 signedIdx = static_cast<qint32>(index); \
                 if (signedIdx < count) \
                     return ConversionToV8fn(engine, c.at(signedIdx)); \
-                return v8::Undefined(); \
+                return QV4::Value::undefinedValue(); \
             } \
             v8::Handle<v8::Boolean> indexedDeleter(quint32 index) \
             { \
@@ -447,7 +447,7 @@ static QString convertUrlToString(QV8Engine *, const QUrl &v)
             { \
                 if (objectType == QV8SequenceResource::Reference) { \
                     if (!object) \
-                        return v8::Undefined(); \
+                        return QV4::Value::undefinedValue(); \
                     loadReference(); \
                 } \
                 QString str; \
diff --git a/src/qml/qml/v8/qv8typewrapper.cpp b/src/qml/qml/v8/qv8typewrapper.cpp
index 34f5532..5a1ffbb 100644
--- a/src/qml/qml/v8/qv8typewrapper.cpp
+++ b/src/qml/qml/v8/qv8typewrapper.cpp
@@ -153,7 +153,7 @@ v8::Handle<v8::Value> QV8TypeWrapper::Getter(v8::Handle<v8::String> property,
     QV8TypeResource *resource = v8_resource_cast<QV8TypeResource>(info.This());
 
     if (!resource) 
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     QV8Engine *v8engine = resource->engine;
     QQmlContextData *context = v8engine->callingContext();
@@ -246,7 +246,7 @@ v8::Handle<v8::Value> QV8TypeWrapper::Getter(v8::Handle<v8::String> property,
                 return v8engine->typeWrapper()->newObject(object, context->imports, r.importNamespace);
             }
 
-            return v8::Undefined();
+            return QV4::Value::undefinedValue();
 
         }
 
diff --git a/src/qml/qml/v8/qv8valuetypewrapper.cpp b/src/qml/qml/v8/qv8valuetypewrapper.cpp
index f7fa0b7..1bc2c4b 100644
--- a/src/qml/qml/v8/qv8valuetypewrapper.cpp
+++ b/src/qml/qml/v8/qv8valuetypewrapper.cpp
@@ -263,7 +263,7 @@ v8::Handle<v8::Value> QV8ValueTypeWrapper::ToString(const v8::Arguments &args)
             if (reference->object && readReferenceValue(reference)) {
                 return resource->engine->toString(resource->type->toString());
             } else {
-                return v8::Undefined();
+                return QV4::Value::undefinedValue();
             }
         } else {
             Q_ASSERT(resource->objectType == QV8ValueTypeResource::Copy);
@@ -272,7 +272,7 @@ v8::Handle<v8::Value> QV8ValueTypeWrapper::ToString(const v8::Arguments &args)
             return resource->engine->toString(resource->type->toString());
         }
     } else {
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     }
 }
 
diff --git a/src/qml/qml/v8/qv8variantwrapper.cpp b/src/qml/qml/v8/qv8variantwrapper.cpp
index ebe24c5..c2c5988 100644
--- a/src/qml/qml/v8/qv8variantwrapper.cpp
+++ b/src/qml/qml/v8/qv8variantwrapper.cpp
@@ -227,7 +227,7 @@ v8::Handle<v8::Value> QV8VariantWrapper::Preserve(const v8::Arguments &args)
     if (resource) {
         resource->node.remove();
     }
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> QV8VariantWrapper::Destroy(const v8::Arguments &args)
@@ -237,7 +237,7 @@ v8::Handle<v8::Value> QV8VariantWrapper::Destroy(const v8::Arguments &args)
         resource->data = QVariant();
         resource->node.remove();
     }
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> QV8VariantWrapper::ToString(const v8::Arguments &args)
@@ -249,7 +249,7 @@ v8::Handle<v8::Value> QV8VariantWrapper::ToString(const v8::Arguments &args)
             result = QString::fromLatin1("QVariant(%0)").arg(QString::fromLatin1(resource->data.typeName()));
         return resource->engine->toString(result);
     } else {
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     }
 }
 
@@ -260,7 +260,7 @@ v8::Handle<v8::Value> QV8VariantWrapper::ValueOf(const v8::Arguments &args)
         QVariant v = resource->data;
         switch (v.type()) {
         case QVariant::Invalid:
-            return v8::Undefined();
+            return QV4::Value::undefinedValue();
         case QVariant::String:
             return resource->engine->toString(v.toString());
         case QVariant::Int:
diff --git a/src/qml/qml/v8/qv8worker.cpp b/src/qml/qml/v8/qv8worker.cpp
index c536e6c..1bbe477 100644
--- a/src/qml/qml/v8/qv8worker.cpp
+++ b/src/qml/qml/v8/qv8worker.cpp
@@ -235,7 +235,7 @@ void QV8Worker::serialize(QByteArray &data, v8::Handle<v8::Value> v, QV8Engine *
 
             v8::Handle<v8::Value> val = object->Get(str);
             if (tc.HasCaught()) {
-                serialize(data, v8::Undefined(), engine);
+                serialize(data, QV4::Value::undefinedValue(), engine);
                 tc.Reset();
             } else {
                 serialize(data, val, engine);
@@ -293,7 +293,7 @@ v8::Handle<v8::Value> QV8Worker::deserialize(const char *&data, QV8Engine *engin
 
     switch (type) {
     case WorkerUndefined:
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
     case WorkerNull:
         return v8::Null();
     case WorkerTrue:
@@ -374,7 +374,7 @@ v8::Handle<v8::Value> QV8Worker::deserialize(const char *&data, QV8Engine *engin
     }
     }
     Q_ASSERT(!"Unreachable");
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 QByteArray QV8Worker::serialize(v8::Handle<v8::Value> value, QV8Engine *engine)
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index b0b7085..f695d67 100644
--- a/src/qml/types/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
@@ -1370,7 +1370,7 @@ QQmlDelegateModelPrivate::buildChangeList(const QVector<T> &changes)
         v8::Handle<v8::Object> object = v8::Object::New();
         object->Set(indexKey, v8::Integer::New(changes.at(i).index));
         object->Set(countKey, v8::Integer::New(changes.at(i).count));
-        object->Set(moveIdKey, changes.at(i).moveId != -1 ? v8::Integer::New(changes.at(i).count) : v8::Undefined());
+        object->Set(moveIdKey, changes.at(i).moveId != -1 ? v8::Integer::New(changes.at(i).count) : QV4::Value::undefinedValue());
         indexes->Set(i, object);
     }
     return indexes;
@@ -1654,7 +1654,7 @@ v8::Handle<v8::Value> QQmlDelegateModelItemMetaType::get_model(
     QQmlDelegateModelItem *cacheItem = v8_resource_cast<QQmlDelegateModelItem>(info.This());
     V8ASSERT_TYPE(cacheItem, "Not a valid VisualData object");
     if (!cacheItem->metaType->model)
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     return cacheItem->get();
 }
@@ -2295,14 +2295,14 @@ QQmlV4Handle QQmlDelegateModelGroup::get(int index)
 {
     Q_D(QQmlDelegateModelGroup);
     if (!d->model)
-        return QQmlV4Handle::fromV8Handle(v8::Undefined());;
+        return QQmlV4Handle::fromV8Handle(QV4::Value::undefinedValue());;
 
     QQmlDelegateModelPrivate *model = QQmlDelegateModelPrivate::get(d->model);
     if (!model->m_context->isValid()) {
-        return QQmlV4Handle::fromV8Handle(v8::Undefined());
+        return QQmlV4Handle::fromV8Handle(QV4::Value::undefinedValue());
     } else if (index < 0 || index >= model->m_compositor.count(d->group)) {
         qmlInfo(this) << tr("get: index out of range");
-        return QQmlV4Handle::fromV8Handle(v8::Undefined());
+        return QQmlV4Handle::fromV8Handle(QV4::Value::undefinedValue());
     }
 
     Compositor::iterator it = model->m_compositor.find(d->group, index);
@@ -2314,7 +2314,7 @@ QQmlV4Handle QQmlDelegateModelGroup::get(int index)
         cacheItem = model->m_adaptorModel.createItem(
                 model->m_cacheMetaType, model->m_context->engine(), it.modelIndex());
         if (!cacheItem)
-            return QQmlV4Handle::fromV8Handle(v8::Undefined());
+            return QQmlV4Handle::fromV8Handle(QV4::Value::undefinedValue());
         cacheItem->groups = it->flags;
 
         model->m_cache.insert(it.cacheIndex, cacheItem);
@@ -3074,7 +3074,7 @@ public:
         V8ASSERT_TYPE(array, "Not a valid change array");
 
         if (index >= array->count())
-            return v8::Undefined();
+            return QV4::Value::undefinedValue();
 
         const QQmlChangeSet::Change &change = array->at(index);
 
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
index 755103c..8a5dd1f 100644
--- a/src/qml/types/qqmllistmodel.cpp
+++ b/src/qml/types/qqmllistmodel.cpp
@@ -2121,7 +2121,7 @@ void QQmlListModel::append(QQmlV8Function *args)
 */
 QQmlV4Handle QQmlListModel::get(int index) const
 {
-    v8::Handle<v8::Value> result = v8::Undefined();
+    v8::Handle<v8::Value> result = QV4::Value::undefinedValue();
 
     if (index >= 0 && index < count()) {
         QV8Engine *v8engine = engine();
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp
index e6c0e7d..3eb1461 100644
--- a/src/qml/types/qquickworkerscript.cpp
+++ b/src/qml/types/qquickworkerscript.cpp
@@ -283,12 +283,12 @@ v8::Handle<v8::Value> QQuickWorkerScriptEnginePrivate::sendMessage(const v8::Arg
     QMutexLocker locker(&engine->p->m_lock);
     WorkerScript *script = engine->p->workers.value(id);
     if (!script)
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     if (script->owner)
         QCoreApplication::postEvent(script->owner, new WorkerDataEvent(0, data));
 
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 // Requires handle scope and context scope
@@ -657,7 +657,7 @@ void QQuickWorkerScript::sendMessage(QQmlV8Function *args)
         return;
     }
 
-    v8::Handle<v8::Value> argument = v8::Undefined();
+    v8::Handle<v8::Value> argument = QV4::Value::undefinedValue();
     if (args->Length() != 0) 
         argument = (*args)[0];
 
diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp
index 6c1c593..408f452 100644
--- a/src/qml/util/qqmladaptormodel.cpp
+++ b/src/qml/util/qqmladaptormodel.cpp
@@ -347,7 +347,7 @@ v8::Handle<v8::Value> QQmlDMCachedModelData::get_property(
         return data->engine->fromVariant(
                 modelData->value(modelData->type->propertyRoles.at(propertyId)));
     }
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 void QQmlDMCachedModelData::set_property(
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index ca4e201..1dadac8 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -1227,7 +1227,7 @@ static v8::Handle<v8::Value> ctx2d_createPattern(const v8::Arguments &args)
         return pattern;
 
     }
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 // line styles
@@ -2222,7 +2222,7 @@ static v8::Handle<v8::Value> ctx2d_measureText(const v8::Arguments &args)
         tm->Set(v8::String::New("width"), v8::Number::New(width));
         return tm;
     }
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 // drawing images
@@ -2461,7 +2461,7 @@ v8::Handle<v8::Value> ctx2d_imageData_data(v8::Handle<v8::String>, const v8::Acc
 v8::Handle<v8::Value> ctx2d_pixelArray_length(v8::Handle<v8::String>, const v8::AccessorInfo &args)
 {
     QV8Context2DPixelArrayResource *r = v8_resource_cast<QV8Context2DPixelArrayResource>(args.This());
-    if (!r || r->image.isNull()) return v8::Undefined();
+    if (!r || r->image.isNull()) return QV4::Value::undefinedValue();
 
     return v8::Integer::New(r->image.width() * r->image.height() * 4);
 }
@@ -2487,7 +2487,7 @@ v8::Handle<v8::Value> ctx2d_pixelArray_indexed(uint32_t index, const v8::Accesso
             return v8::Integer::New(qAlpha(*pixel));
         }
     }
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 v8::Handle<v8::Value> ctx2d_pixelArray_indexed_set(uint32_t index, v8::Handle<v8::Value> value, const v8::AccessorInfo& info)
@@ -2517,7 +2517,7 @@ v8::Handle<v8::Value> ctx2d_pixelArray_indexed_set(uint32_t index, v8::Handle<v8
             break;
         }
     }
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 /*!
   \qmlmethod CanvasImageData QtQuick2::Context2D::createImageData(real sw, real sh)
@@ -2567,7 +2567,7 @@ static v8::Handle<v8::Value> ctx2d_createImageData(const v8::Arguments &args)
         else
             V8THROW_DOM(DOMEXCEPTION_INDEX_SIZE_ERR, "createImageData(): invalid arguments");
     }
-    return v8::Undefined();
+    return QV4::Value::undefinedValue();
 }
 
 /*!
@@ -2608,7 +2608,7 @@ static v8::Handle<v8::Value> ctx2d_putImageData(const v8::Arguments &args)
     QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(args.This());
     CHECK_CONTEXT(r)
     if (args.Length() != 3 && args.Length() != 7)
-        return v8::Undefined();
+        return QV4::Value::undefinedValue();
 
     if (args[0]->IsNull() || !args[0]->IsObject()) {
         V8THROW_DOM(DOMEXCEPTION_TYPE_MISMATCH_ERR, "Context2D::putImageData, the image data type mismatch");
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index a1f9502..e638346 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -570,7 +570,7 @@ void QQuickLoader::setSource(QQmlV8Function *args)
     Q_D(QQuickLoader);
 
     bool ipvError = false;
-    args->returnValue(v8::Undefined());
+    args->returnValue(QV4::Value::undefinedValue());
     v8::Handle<v8::Object> ipv = d->extractInitialPropertyValues(args, this, &ipvError);
     if (ipvError)
         return;
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 06590f0..51ecb04 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -2272,14 +2272,14 @@ void tst_qqmlecmascript::callQtInvokables()
 
     // Excessive arguments
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_int(10, 11)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_int(10, 11)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 8);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(10));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_intint(10, 11, 12)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_intint(10, 11, 12)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 9);
     QCOMPARE(o->actuals().count(), 2);
@@ -2288,7 +2288,7 @@ void tst_qqmlecmascript::callQtInvokables()
 
     // Test return types
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_NoArgs()", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_NoArgs()", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 0);
     QCOMPARE(o->actuals().count(), 0);
@@ -2348,49 +2348,49 @@ void tst_qqmlecmascript::callQtInvokables()
 
     // Test arg types
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_int(94)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_int(94)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 8);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(94));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_int(\"94\")", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_int(\"94\")", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 8);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(94));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_int(\"not a number\")", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_int(\"not a number\")", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 8);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(0));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_int(null)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_int(null)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 8);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(0));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_int(undefined)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_int(undefined)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 8);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(0));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_int(object)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_int(object)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 8);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(0));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_intint(122, 9)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_intint(122, 9)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 9);
     QCOMPARE(o->actuals().count(), 2);
@@ -2398,56 +2398,56 @@ void tst_qqmlecmascript::callQtInvokables()
     QCOMPARE(o->actuals().at(1), QVariant(9));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_real(94.3)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_real(94.3)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 10);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(94.3));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_real(\"94.3\")", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_real(\"94.3\")", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 10);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(94.3));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_real(\"not a number\")", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_real(\"not a number\")", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 10);
     QCOMPARE(o->actuals().count(), 1);
     QVERIFY(qIsNaN(o->actuals().at(0).toDouble()));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_real(null)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_real(null)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 10);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(0));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_real(undefined)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_real(undefined)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 10);
     QCOMPARE(o->actuals().count(), 1);
     QVERIFY(qIsNaN(o->actuals().at(0).toDouble()));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_real(object)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_real(object)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 10);
     QCOMPARE(o->actuals().count(), 1);
     QVERIFY(qIsNaN(o->actuals().at(0).toDouble()));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QString(\"Hello world\")", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QString(\"Hello world\")", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 11);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant("Hello world"));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QString(19)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QString(19)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 11);
     QCOMPARE(o->actuals().count(), 1);
@@ -2456,7 +2456,7 @@ void tst_qqmlecmascript::callQtInvokables()
     o->reset();
     {
     QString expected = "MyInvokableObject(0x" + QString::number((quintptr)o, 16) + ")";
-    QVERIFY(EVALUATE_VALUE("object.method_QString(object)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QString(object)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 11);
     QCOMPARE(o->actuals().count(), 1);
@@ -2464,126 +2464,126 @@ void tst_qqmlecmascript::callQtInvokables()
     }
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QString(null)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QString(null)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 11);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(QString()));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QString(undefined)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QString(undefined)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 11);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(QString()));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QPointF(0)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QPointF(0)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 12);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(QPointF()));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QPointF(null)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QPointF(null)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 12);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(QPointF()));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QPointF(undefined)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QPointF(undefined)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 12);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(QPointF()));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QPointF(object)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QPointF(object)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 12);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(QPointF()));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QPointF(object.method_get_QPointF())", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QPointF(object.method_get_QPointF())", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 12);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(QPointF(99.3, -10.2)));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QPointF(object.method_get_QPoint())", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QPointF(object.method_get_QPoint())", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 12);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(QPointF(9, 12)));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QObject(0)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QObject(0)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 13);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), qVariantFromValue((QObject *)0));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QObject(\"Hello world\")", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QObject(\"Hello world\")", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 13);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), qVariantFromValue((QObject *)0));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QObject(null)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QObject(null)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 13);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), qVariantFromValue((QObject *)0));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QObject(undefined)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QObject(undefined)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 13);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), qVariantFromValue((QObject *)0));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QObject(object)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QObject(object)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 13);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), qVariantFromValue((QObject *)o));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QScriptValue(null)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QScriptValue(null)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 14);
     QCOMPARE(o->actuals().count(), 1);
     QVERIFY(qvariant_cast<QJSValue>(o->actuals().at(0)).isNull());
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QScriptValue(undefined)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QScriptValue(undefined)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 14);
     QCOMPARE(o->actuals().count(), 1);
     QVERIFY(qvariant_cast<QJSValue>(o->actuals().at(0)).isUndefined());
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QScriptValue(19)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QScriptValue(19)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 14);
     QCOMPARE(o->actuals().count(), 1);
     QVERIFY(qvariant_cast<QJSValue>(o->actuals().at(0)).strictlyEquals(QJSValue(19)));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QScriptValue([19, 20])", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QScriptValue([19, 20])", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 14);
     QCOMPARE(o->actuals().count(), 1);
     QVERIFY(qvariant_cast<QJSValue>(o->actuals().at(0)).isArray());
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(4, null)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(4, null)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 15);
     QCOMPARE(o->actuals().count(), 2);
@@ -2591,7 +2591,7 @@ void tst_qqmlecmascript::callQtInvokables()
     QVERIFY(qvariant_cast<QJSValue>(o->actuals().at(1)).isNull());
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(8, undefined)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(8, undefined)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 15);
     QCOMPARE(o->actuals().count(), 2);
@@ -2599,7 +2599,7 @@ void tst_qqmlecmascript::callQtInvokables()
     QVERIFY(qvariant_cast<QJSValue>(o->actuals().at(1)).isUndefined());
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(3, 19)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(3, 19)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 15);
     QCOMPARE(o->actuals().count(), 2);
@@ -2607,7 +2607,7 @@ void tst_qqmlecmascript::callQtInvokables()
     QVERIFY(qvariant_cast<QJSValue>(o->actuals().at(1)).strictlyEquals(QJSValue(19)));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(44, [19, 20])", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_intQScriptValue(44, [19, 20])", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 15);
     QCOMPARE(o->actuals().count(), 2);
@@ -2621,14 +2621,14 @@ void tst_qqmlecmascript::callQtInvokables()
     QCOMPARE(o->actuals().count(), 0);
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_overload(10)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_overload(10)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 16);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(10));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_overload(10, 11)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_overload(10, 11)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 17);
     QCOMPARE(o->actuals().count(), 2);
@@ -2636,14 +2636,14 @@ void tst_qqmlecmascript::callQtInvokables()
     QCOMPARE(o->actuals().at(1), QVariant(11));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_overload(\"Hello\")", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_overload(\"Hello\")", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 18);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(QString("Hello")));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_with_enum(9)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_with_enum(9)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 19);
     QCOMPARE(o->actuals().count(), 1);
@@ -2666,14 +2666,14 @@ void tst_qqmlecmascript::callQtInvokables()
     QCOMPARE(o->actuals().at(1), QVariant(13));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_inherited(9)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_inherited(9)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), -3);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(o->actuals().at(0), QVariant(9));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QVariant(9)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QVariant(9)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 21);
     QCOMPARE(o->actuals().count(), 2);
@@ -2681,7 +2681,7 @@ void tst_qqmlecmascript::callQtInvokables()
     QCOMPARE(o->actuals().at(1), QVariant());
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QVariant(\"Hello\", \"World\")", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QVariant(\"Hello\", \"World\")", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 21);
     QCOMPARE(o->actuals().count(), 2);
@@ -2689,91 +2689,91 @@ void tst_qqmlecmascript::callQtInvokables()
     QCOMPARE(o->actuals().at(1), QVariant(QString("World")));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QJsonObject({foo:123})", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QJsonObject({foo:123})", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 22);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(qvariant_cast<QJsonObject>(o->actuals().at(0)), QJsonDocument::fromJson("{\"foo\":123}").object());
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QJsonArray([123])", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QJsonArray([123])", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 23);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(qvariant_cast<QJsonArray>(o->actuals().at(0)), QJsonDocument::fromJson("[123]").array());
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(123)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(123)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 24);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(123));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(42.35)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(42.35)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 24);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(42.35));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QJsonValue('ciao')", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QJsonValue('ciao')", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 24);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(QStringLiteral("ciao")));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(true)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(true)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 24);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(true));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(false)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(false)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 24);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(false));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(null)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(null)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 24);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(QJsonValue::Null));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(undefined)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_QJsonValue(undefined)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 24);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(QJsonValue::Undefined));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_overload({foo:123})", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_overload({foo:123})", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 25);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(qvariant_cast<QJsonObject>(o->actuals().at(0)), QJsonDocument::fromJson("{\"foo\":123}").object());
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_overload([123])", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_overload([123])", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 26);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(qvariant_cast<QJsonArray>(o->actuals().at(0)), QJsonDocument::fromJson("[123]").array());
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_overload(null)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_overload(null)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 27);
     QCOMPARE(o->actuals().count(), 1);
     QCOMPARE(qvariant_cast<QJsonValue>(o->actuals().at(0)), QJsonValue(QJsonValue::Null));
 
     o->reset();
-    QVERIFY(EVALUATE_VALUE("object.method_overload(undefined)", v8::Undefined()));
+    QVERIFY(EVALUATE_VALUE("object.method_overload(undefined)", QV4::Value::undefinedValue()));
     QCOMPARE(o->error(), false);
     QCOMPARE(o->invoked(), 27);
     QCOMPARE(o->actuals().count(), 1);