diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-07 09:54:05 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@digia.com> | 2013-05-07 12:25:38 +0200 |
commit | 1abed74e211585ef9d8aab46ab924a212860c5fe (patch) | |
tree | 7c93d691dab64ff6cedf8f8b073878f5e78dcbdd /src/qml/qml/v8 | |
parent | e855f1387badcbf88954b8707c1dc418cc66c215 (diff) |
Replace v8::Undefined() with QV4::Value::undefinedValue()
Change-Id: I4c7bb5bcc1bc15a982bb83d2597e6ae4bc5710cd
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/v8')
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 32 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8contextwrapper.cpp | 8 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8include.cpp | 4 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8listwrapper.cpp | 6 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8qobjectwrapper.cpp | 40 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8sequencewrapper_p_p.h | 12 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8typewrapper.cpp | 4 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8valuetypewrapper.cpp | 4 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8variantwrapper.cpp | 8 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8worker.cpp | 6 |
10 files changed, 62 insertions, 62 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 636725000d..a02ecf5726 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 5e84082d8c..e36665027f 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 f37ed73ee5..92e262157b 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 37b5de739f..7ad590aff2 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 f669d20de6..81668494d6 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 da56fa457e..c8d61422e5 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 34f553298d..5a1ffbb4e0 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 f7fa0b7adf..1bc2c4b4a7 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 ebe24c51ae..c2c5988e0e 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 c536e6cc27..1bbe4779fc 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) |