5 files changed, 11 insertions, 9 deletions
diff --git a/src/script/api/qscriptclass.cpp b/src/script/api/qscriptclass.cpp
index 01657af..732dab4 100644
--- a/src/script/api/qscriptclass.cpp
+++ b/src/script/api/qscriptclass.cpp
@@ -252,7 +252,7 @@ QScriptClass::QueryFlags QScriptClass::queryProperty(
     Q_UNUSED(name);
     Q_UNUSED(flags);
     Q_UNUSED(id);
-    return 0;
+    return {};
 }
 
 /*!
@@ -292,7 +292,7 @@ QScriptValue::PropertyFlags QScriptClass::propertyFlags(
     Q_UNUSED(object);
     Q_UNUSED(name);
     Q_UNUSED(id);
-    return 0;
+    return {};
 }
 
 /*!
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 2cf25ab..a18c2fe 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -1348,8 +1348,10 @@ void QScriptEnginePrivate::collectGarbage()
 
 void QScriptEnginePrivate::reportAdditionalMemoryCost(int size)
 {
-    if (size > 0)
+    if (size > 0) {
+        QScript::APIShim shim(this);
         globalData->heap.reportExtraMemoryCost(size);
+    }
 }
 
 QScript::TimeoutCheckerProxy *QScriptEnginePrivate::timeoutChecker() const
@@ -2004,9 +2006,9 @@ QScriptValue::PropertyFlags QScriptEnginePrivate::propertyFlags(JSC::ExecState *
             JSC::JSValue proto = object->prototype();
             return propertyFlags(exec, proto, id, mode);
         }
-        return 0;
+        return {};
     }
-    QScriptValue::PropertyFlags result = 0;
+    QScriptValue::PropertyFlags result;
     if (attribs & JSC::ReadOnly)
         result |= QScriptValue::ReadOnly;
     if (attribs & JSC::DontEnum)
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h
index cc0dcc5..73387e5 100644
--- a/src/script/api/qscriptengine_p.h
+++ b/src/script/api/qscriptengine_p.h
@@ -345,7 +345,7 @@ public:
     void markQObjectData(JSC::MarkStack&);
     JSC::JSValue newQObject(QObject *object,
         QScriptEngine::ValueOwnership ownership = QScriptEngine::QtOwnership,
-        const QScriptEngine:: QObjectWrapOptions &options = 0);
+                 const QScriptEngine:: QObjectWrapOptions &options = {});
     JSC::JSValue newQMetaObject(const QMetaObject *metaObject,
                                 JSC::JSValue ctor);
 
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index 6b192dd..7c37c4d 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -1523,7 +1523,7 @@ QScriptValue::PropertyFlags QScriptValue::propertyFlags(const QString &name,
 {
     Q_D(const QScriptValue);
     if (!d || !d->isObject())
-        return 0;
+        return {};
     QScript::APIShim shim(d->engine);
     JSC::ExecState *exec = d->engine->currentFrame;
     return d->propertyFlags(JSC::Identifier(exec, name), mode);
@@ -1543,7 +1543,7 @@ QScriptValue::PropertyFlags QScriptValue::propertyFlags(const QScriptString &nam
 {
     Q_D(const QScriptValue);
     if (!d || !d->isObject() || !QScriptStringPrivate::isValid(name))
-        return 0;
+        return {};
     return d->propertyFlags(name.d_ptr->identifier, mode);
 }
 
diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp
index 826f5ad..0315e48 100644
--- a/src/script/api/qscriptvalueiterator.cpp
+++ b/src/script/api/qscriptvalueiterator.cpp
@@ -339,7 +339,7 @@ QScriptValue::PropertyFlags QScriptValueIterator::flags() const
 {
     Q_D(const QScriptValueIterator);
     if (!d || !d->initialized || !d->engine())
-        return 0;
+        return {};
     QScript::APIShim shim(d->engine());
     return d->object()->propertyFlags(*d->current);
 }