aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsapi
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2021-01-07 16:05:07 +0100
committerUlf Hermann <ulf.hermann@qt.io>2021-01-11 20:48:22 +0100
commit05b5a0896da2c12d50898abb2bf3dc5c5f158a16 (patch)
tree84feb82e246a0a445b73090cc68e67df5f250ab0 /src/qml/jsapi
parent2c82f4f8b61e8d7c22a979ef7ca3ea0465da278d (diff)
QJSManagedValue: Silence some static analysis warnings
The engine should really always be available if we have a d pointer. Change-Id: If620e69de07c6d365b45e714bae3ec0fb7eb86ef Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsapi')
-rw-r--r--src/qml/jsapi/qjsmanagedvalue.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/qml/jsapi/qjsmanagedvalue.cpp b/src/qml/jsapi/qjsmanagedvalue.cpp
index 4c88636850..35efd5c0f3 100644
--- a/src/qml/jsapi/qjsmanagedvalue.cpp
+++ b/src/qml/jsapi/qjsmanagedvalue.cpp
@@ -135,7 +135,12 @@ QT_BEGIN_NAMESPACE
static QV4::ExecutionEngine *v4Engine(QV4::Value *d)
{
- return d ? QV4::PersistentValueStorage::getEngine(d) : nullptr;
+ if (!d)
+ return nullptr;
+
+ QV4::ExecutionEngine *v4 = QV4::PersistentValueStorage::getEngine(d);
+ Q_ASSERT(v4);
+ return v4;
}
/*!
@@ -1037,7 +1042,7 @@ QJSValue QJSManagedValue::callAsConstructor(const QJSValueList &arguments) const
}
QJSManagedValue::QJSManagedValue(QV4::ExecutionEngine *engine) :
- d(engine ? engine->memoryManager->m_persistentValues->allocate() : nullptr)
+ d(engine->memoryManager->m_persistentValues->allocate())
{
}