diff options
Diffstat (limited to 'src/qml/qml/qqmltypeloaderqmldircontent_p.h')
-rw-r--r-- | src/qml/qml/qqmltypeloaderqmldircontent_p.h | 50 |
1 files changed, 11 insertions, 39 deletions
diff --git a/src/qml/qml/qqmltypeloaderqmldircontent_p.h b/src/qml/qml/qqmltypeloaderqmldircontent_p.h index 55cd846925..421eb16da4 100644 --- a/src/qml/qml/qqmltypeloaderqmldircontent_p.h +++ b/src/qml/qml/qqmltypeloaderqmldircontent_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 QQMLTYPELOADERQMLDIRCONTENT_P_H #define QQMLTYPELOADERQMLDIRCONTENT_P_H @@ -71,7 +35,7 @@ public: bool hasContent() const { return m_hasContent; } bool hasError() const { return m_parser.hasError(); } - QList<QQmlError> errors(const QString &uri) const; + QList<QQmlError> errors(const QString &uri, const QUrl &url) const; QString typeNamespace() const { return m_parser.typeNamespace(); } @@ -83,7 +47,15 @@ public: QString qmldirLocation() const { return m_location; } QString preferredPath() const { return m_parser.preferredPath(); } + bool hasRedirection() const + { + const QString preferred = preferredPath(); + return !preferred.isEmpty() + && preferred != QStringView(m_location).chopped(strlen("qmldir")); + } + bool designerSupported() const { return m_parser.designerSupported(); } + bool hasTypeInfo() const { return !m_parser.typeInfos().isEmpty(); } private: QQmlDirParser m_parser; |