diff options
Diffstat (limited to 'src/qml/qml/qqmlcontext.h')
| -rw-r--r-- | src/qml/qml/qqmlcontext.h | 55 |
1 files changed, 9 insertions, 46 deletions
diff --git a/src/qml/qml/qqmlcontext.h b/src/qml/qml/qqmlcontext.h index 7ed70c7619..b02aefe1d6 100644 --- a/src/qml/qml/qqmlcontext.h +++ b/src/qml/qml/qqmlcontext.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 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 QQMLCONTEXT_H #define QQMLCONTEXT_H @@ -53,7 +17,6 @@ QT_BEGIN_NAMESPACE class QString; class QQmlEngine; -class QQmlRefCount; class QQmlContextPrivate; class QQmlCompositeTypeData; class QQmlContextData; @@ -81,16 +44,18 @@ public: QVariant contextProperty(const QString &) const; void setContextProperty(const QString &, QObject *); void setContextProperty(const QString &, const QVariant &); - void setContextProperties(const QVector<PropertyPair> &properties); + void setContextProperties(const QList<PropertyPair> &properties); - // ### Qt 6: no need for a mutable object, this should become a const QObject pointer - QString nameForObject(QObject *) const; + QString nameForObject(const QObject *) const; + QObject *objectForName(const QString &) const; - QUrl resolvedUrl(const QUrl &); + QUrl resolvedUrl(const QUrl &) const; void setBaseUrl(const QUrl &); QUrl baseUrl() const; + QJSValue importedScript(const QString &name) const; + private: friend class QQmlEngine; friend class QQmlEnginePrivate; @@ -100,12 +65,10 @@ private: friend class QQmlComponentPrivate; friend class QQmlScriptPrivate; friend class QQmlContextData; - QQmlContext(QQmlContextData *); + QQmlContext(QQmlContextPrivate &dd, QObject *parent = nullptr); QQmlContext(QQmlEngine *, bool); Q_DISABLE_COPY(QQmlContext) }; QT_END_NAMESPACE -Q_DECLARE_METATYPE(QList<QObject*>) - #endif // QQMLCONTEXT_H |