diff options
Diffstat (limited to 'src/qml/qml/qqmlscriptdata_p.h')
| -rw-r--r-- | src/qml/qml/qqmlscriptdata_p.h | 55 |
1 files changed, 11 insertions, 44 deletions
diff --git a/src/qml/qml/qqmlscriptdata_p.h b/src/qml/qml/qqmlscriptdata_p.h index 816e968f6e..ad5ffb3d07 100644 --- a/src/qml/qml/qqmlscriptdata_p.h +++ b/src/qml/qml/qqmlscriptdata_p.h @@ -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 #ifndef QQMLSCRIPTDATA_P_H #define QQMLSCRIPTDATA_P_H @@ -55,7 +19,7 @@ #include <private/qqmlscriptblob_p.h> #include <private/qv4value_p.h> #include <private/qv4persistent_p.h> -#include <private/qv4executablecompilationunit_p.h> +#include <private/qv4compileddata_p.h> #include <QtCore/qurl.h> @@ -64,12 +28,12 @@ QT_BEGIN_NAMESPACE class QQmlTypeNameCache; class QQmlContextData; -class Q_AUTOTEST_EXPORT QQmlScriptData : public QQmlRefCount +class Q_AUTOTEST_EXPORT QQmlScriptData final : public QQmlRefCounted<QQmlScriptData> { private: friend class QQmlTypeLoader; - QQmlScriptData(); + QQmlScriptData() = default; public: QUrl url; @@ -79,7 +43,10 @@ public: QV4::ReturnedValue scriptValueForContext(const QQmlRefPointer<QQmlContextData> &parentCtxt); - QQmlRefPointer<QV4::ExecutableCompilationUnit> compilationUnit() const { return m_precompiledScript; } + QQmlRefPointer<QV4::CompiledData::CompilationUnit> compilationUnit() const + { + return m_precompiledScript; + } private: friend class QQmlScriptBlob; @@ -87,8 +54,8 @@ private: QQmlRefPointer<QQmlContextData> qmlContextDataForContext( const QQmlRefPointer<QQmlContextData> &parentQmlContextData); - bool m_loaded; - QQmlRefPointer<QV4::ExecutableCompilationUnit> m_precompiledScript; + bool m_loaded = false; + QQmlRefPointer<QV4::CompiledData::CompilationUnit> m_precompiledScript; QV4::PersistentValue m_value; }; |