diff options
Diffstat (limited to 'src/qml/qml/qqmlscriptdata.cpp')
| -rw-r--r-- | src/qml/qml/qqmlscriptdata.cpp | 60 |
1 files changed, 11 insertions, 49 deletions
diff --git a/src/qml/qml/qqmlscriptdata.cpp b/src/qml/qml/qqmlscriptdata.cpp index 684564fcfb..9337f25c6e 100644 --- a/src/qml/qml/qqmlscriptdata.cpp +++ b/src/qml/qml/qqmlscriptdata.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <private/qqmlscriptdata_p.h> #include <private/qqmlcontext_p.h> @@ -49,18 +13,12 @@ QT_BEGIN_NAMESPACE -QQmlScriptData::QQmlScriptData() - : typeNameCache(nullptr) - , m_loaded(false) -{ -} - QQmlRefPointer<QQmlContextData> QQmlScriptData::qmlContextDataForContext( const QQmlRefPointer<QQmlContextData> &parentQmlContextData) { Q_ASSERT(parentQmlContextData && parentQmlContextData->engine()); - if (m_precompiledScript->isESModule()) + if (!m_precompiledScript || m_precompiledScript->isESModule()) return nullptr; QQmlRefPointer<QQmlContextData> qmlContextData = m_precompiledScript->isSharedLibrary() @@ -92,15 +50,15 @@ QQmlRefPointer<QQmlContextData> QQmlScriptData::qmlContextDataForContext( QV4::Scope scope(v4); QV4::ScopedObject scriptsArray(scope); if (qmlContextData->importedScripts().isNullOrUndefined()) { - scriptsArray = v4->newArrayObject(scripts.count()); + scriptsArray = v4->newArrayObject(scripts.size()); qmlContextData->setImportedScripts( QV4::PersistentValue(v4, scriptsArray.asReturnedValue())); } else { scriptsArray = qmlContextData->importedScripts().valueRef(); } QV4::ScopedValue v(scope); - for (int ii = 0; ii < scripts.count(); ++ii) { - v = scripts.at(ii)->scriptData()->scriptValueForContext(qmlContextData.data()); + for (int ii = 0; ii < scripts.size(); ++ii) { + v = scripts.at(ii)->scriptData()->scriptValueForContext(qmlContextData); scriptsArray->put(ii, v); } @@ -123,7 +81,11 @@ QV4::ReturnedValue QQmlScriptData::scriptValueForContext( /* scopeObject: */ nullptr); } - QV4::Scoped<QV4::Module> module(scope, m_precompiledScript->instantiate(v4)); + QV4::Scoped<QV4::Module> module( + scope, + v4->executableCompilationUnit(QQmlRefPointer<QV4::CompiledData::CompilationUnit>( + m_precompiledScript))->instantiate()); + if (module) { if (qmlExecutionContext) { module->d()->scope->outer.set(v4, qmlExecutionContext->d()); |