aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmltest/quicktestresult.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qmltest/quicktestresult.cpp')
-rw-r--r--src/qmltest/quicktestresult.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index c14da7fa56..d33687d248 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -477,18 +477,16 @@ void QuickTestResult::stringify(QQmlV4Function *args)
if (args->length() < 1)
args->setReturnValue(QV4::Value::nullValue());
- v8::Handle<v8::Value> value = (*args)[0];
+ QV4::Value value = (*args)[0];
QString result;
QV8Engine *engine = args->engine();
//Check for Object Type
- if (value->IsObject()
- && !value->IsFunction()
- && !value->IsArray()
- && !value->IsDate()
- && !value->IsRegExp()) {
- QVariant v = engine->toVariant(value->v4Value(), QMetaType::UnknownType);
+ if (value.isObject()
+ && !value.asFunctionObject()
+ && !value.asArrayObject()) {
+ QVariant v = engine->toVariant(value, QMetaType::UnknownType);
if (v.isValid()) {
switch (v.type()) {
case QVariant::Vector3D:
@@ -505,9 +503,8 @@ void QuickTestResult::stringify(QQmlV4Function *args)
result = QLatin1String("Object");
}
} else {
- v8::Handle<v8::String> jsstr = value->ToString();
- QString tmp = jsstr->v4Value().toQString();
- if (value->IsArray())
+ QString tmp = value.toQString();
+ if (value.asArrayObject())
result.append(QString::fromLatin1("[%1]").arg(tmp));
else
result.append(tmp);