diff options
Diffstat (limited to 'src/qml/jsruntime/qv4resolvedtypereference_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4resolvedtypereference_p.h | 64 |
1 files changed, 16 insertions, 48 deletions
diff --git a/src/qml/jsruntime/qv4resolvedtypereference_p.h b/src/qml/jsruntime/qv4resolvedtypereference_p.h index 7e8bedad62..4aaafdd71c 100644 --- a/src/qml/jsruntime/qv4resolvedtypereference_p.h +++ b/src/qml/jsruntime/qv4resolvedtypereference_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the tools applications 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) 2020 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 #ifndef QV4RESOLVEDTYPEREFERNCE_P_H #define QV4RESOLVEDTYPEREFERNCE_P_H @@ -55,7 +19,7 @@ #include <QtQml/private/qqmlrefcount_p.h> #include <QtQml/private/qqmlpropertycache_p.h> #include <QtQml/private/qqmltype_p.h> -#include <QtQml/private/qv4executablecompilationunit_p.h> +#include <QtQml/private/qv4compileddata_p.h> QT_BEGIN_NAMESPACE @@ -73,17 +37,21 @@ public: m_compilationUnit->release(); } - QQmlRefPointer<QQmlPropertyCache> propertyCache() const; - QQmlRefPointer<QQmlPropertyCache> createPropertyCache(QQmlEngine *); - bool addToHash(QCryptographicHash *hash, QQmlEngine *engine); + QQmlPropertyCache::ConstPtr propertyCache() const; + QQmlPropertyCache::ConstPtr createPropertyCache(); + bool addToHash(QCryptographicHash *hash, QHash<quintptr, QByteArray> *checksums); void doDynamicTypeCheck(); QQmlType type() const { return m_type; } void setType(QQmlType type) { m_type = std::move(type); } - QQmlRefPointer<QV4::ExecutableCompilationUnit> compilationUnit() { return m_compilationUnit; } - void setCompilationUnit(QQmlRefPointer<QV4::ExecutableCompilationUnit> unit) + QQmlRefPointer<QV4::CompiledData::CompilationUnit> compilationUnit() + { + return m_compilationUnit; + } + + void setCompilationUnit(QQmlRefPointer<QV4::CompiledData::CompilationUnit> unit) { if (m_compilationUnit == unit.data()) return; @@ -114,8 +82,8 @@ public: } } - QQmlRefPointer<QQmlPropertyCache> typePropertyCache() const { return m_typePropertyCache; } - void setTypePropertyCache(QQmlRefPointer<QQmlPropertyCache> cache) + QQmlPropertyCache::ConstPtr typePropertyCache() const { return m_typePropertyCache; } + void setTypePropertyCache(QQmlPropertyCache::ConstPtr cache) { m_typePropertyCache = std::move(cache); } @@ -128,8 +96,8 @@ public: private: QQmlType m_type; - QQmlRefPointer<QQmlPropertyCache> m_typePropertyCache; - QV4::ExecutableCompilationUnit *m_compilationUnit = nullptr; + QQmlPropertyCache::ConstPtr m_typePropertyCache; + QV4::CompiledData::CompilationUnit *m_compilationUnit = nullptr; QTypeRevision m_version = QTypeRevision::zero(); // Types such as QQmlPropertyMap can add properties dynamically at run-time and |