diff options
Diffstat (limited to 'src/qmlcompiler/qqmljstypereader_p.h')
| -rw-r--r-- | src/qmlcompiler/qqmljstypereader_p.h | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/src/qmlcompiler/qqmljstypereader_p.h b/src/qmlcompiler/qqmljstypereader_p.h index 08c4ff782b..7fa5ccb1f2 100644 --- a/src/qmlcompiler/qqmljstypereader_p.h +++ b/src/qmlcompiler/qqmljstypereader_p.h @@ -1,30 +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:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef QQMLJSTYPEREADER_P_H #define QQMLJSTYPEREADER_P_H @@ -54,20 +29,18 @@ QT_BEGIN_NAMESPACE class QQmlJSTypeReader { public: - QQmlJSTypeReader(QQmlJSImporter *importer, const QString &file, - const QStringList &qmltypesFiles = QStringList()) + QQmlJSTypeReader(QQmlJSImporter *importer, const QString &file) : m_importer(importer) , m_file(file) - , m_qmltypesFiles(qmltypesFiles) {} - QQmlJSScope::Ptr operator()(); + bool operator()(const QSharedPointer<QQmlJSScope> &scope); QList<QQmlJS::DiagnosticMessage> errors() const { return m_errors; } private: QQmlJSImporter *m_importer; QString m_file; - QStringList m_qmltypesFiles; + QStringList m_qmldirFiles; QList<QQmlJS::DiagnosticMessage> m_errors; }; |