diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2025-06-02 12:02:35 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2025-06-05 20:56:15 +0200 |
| commit | 18d370ffb1f09d47f6d2283f1f893503e0aac30e (patch) | |
| tree | 0721eb4330c9039d4d1691f070b35be4da7c14b2 /src/qml/jsapi/qjsengine.cpp | |
| parent | 03a5b7c56637029638a8573c43fa6bd0b69b3dda (diff) | |
QtQml: Better encapsulate QV4::Script
Make members private, add accessors, add m_ to member names, etc.
Change-Id: I497db10b62bbfb32f55dca227af9a518da6eaa70
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
Diffstat (limited to 'src/qml/jsapi/qjsengine.cpp')
| -rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 0b7a9efc7d..8cae6c55be 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -520,12 +520,12 @@ QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, in QV4::ScopedValue result(scope); QV4::Script script(v4->rootContext(), QV4::Compiler::ContextType::Global, program, urlForFileName(fileName).toString(), lineNumber); - script.strictMode = false; + script.setStrictMode(false); if (v4->currentStackFrame) - script.strictMode = v4->currentStackFrame->v4Function->isStrict(); + script.setStrictMode(v4->currentStackFrame->v4Function->isStrict()); else if (v4->globalCode) - script.strictMode = v4->globalCode->isStrict(); - script.inheritContext = true; + script.setStrictMode(v4->globalCode->isStrict()); + script.setInheritContext(); script.parse(); if (!scope.hasException()) result = script.run(); @@ -547,8 +547,8 @@ QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, in if (v4->isInterrupted.loadRelaxed()) result = v4->newErrorObject(QStringLiteral("Interrupted")); - if (script.compilationUnit) - v4->trimCompilationUnitsForUrl(script.compilationUnit->finalUrl()); + if (const auto cu = script.compilationUnit()) + v4->trimCompilationUnitsForUrl(cu->finalUrl()); return QJSValuePrivate::fromReturnedValue(result->asReturnedValue()); } |