diff options
Diffstat (limited to 'src/qmlmodels/qqmllistmodelworkeragent_p.h')
| -rw-r--r-- | src/qmlmodels/qqmllistmodelworkeragent_p.h | 54 |
1 files changed, 9 insertions, 45 deletions
diff --git a/src/qmlmodels/qqmllistmodelworkeragent_p.h b/src/qmlmodels/qqmllistmodelworkeragent_p.h index 1700ff755f..647cc1b997 100644 --- a/src/qmlmodels/qqmllistmodelworkeragent_p.h +++ b/src/qmlmodels/qqmllistmodelworkeragent_p.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 QQUICKLISTMODELWORKERAGENT_P_H #define QQUICKLISTMODELWORKERAGENT_P_H @@ -70,8 +34,8 @@ class QQmlListModel; class QQmlListModelWorkerAgent : public QObject { Q_OBJECT - Q_PROPERTY(int count READ count) - Q_PROPERTY(QV4::ExecutionEngine *engine READ engine WRITE setEngine NOTIFY engineChanged) + Q_PROPERTY(int count READ count FINAL) + Q_PROPERTY(QQmlV4ExecutionEnginePtr engine READ engine WRITE setEngine NOTIFY engineChanged FINAL) QML_ANONYMOUS QML_ADDED_IN_VERSION(2, 0) @@ -88,9 +52,9 @@ public: int count() const; Q_INVOKABLE void clear(); - Q_INVOKABLE void remove(QQmlV4Function *args); - Q_INVOKABLE void append(QQmlV4Function *args); - Q_INVOKABLE void insert(QQmlV4Function *args); + Q_INVOKABLE void remove(QQmlV4FunctionPtr args); + Q_INVOKABLE void append(QQmlV4FunctionPtr args); + Q_INVOKABLE void insert(QQmlV4FunctionPtr args); Q_INVOKABLE QJSValue get(int index) const; Q_INVOKABLE void set(int index, const QJSValue &value); Q_INVOKABLE void setProperty(int index, const QString& property, const QVariant& value); @@ -99,8 +63,8 @@ public: void modelDestroyed(); -signals: - void engineChanged(QV4::ExecutionEngine *engine); +Q_SIGNALS: + void engineChanged(QQmlV4ExecutionEnginePtr engine); protected: bool event(QEvent *) override; |