diff options
Diffstat (limited to 'src/particles/qquicktrailemitter_p.h')
| -rw-r--r-- | src/particles/qquicktrailemitter_p.h | 48 |
1 files changed, 7 insertions, 41 deletions
diff --git a/src/particles/qquicktrailemitter_p.h b/src/particles/qquicktrailemitter_p.h index 6cf2dc0c98..1fee0738d1 100644 --- a/src/particles/qquicktrailemitter_p.h +++ b/src/particles/qquicktrailemitter_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 QtQuick 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 FOLLOWEMITTER_H #define FOLLOWEMITTER_H @@ -55,7 +19,7 @@ QT_BEGIN_NAMESPACE -class QQuickTrailEmitter : public QQuickParticleEmitter +class Q_QUICKPARTICLES_EXPORT QQuickTrailEmitter : public QQuickParticleEmitter { Q_OBJECT Q_PROPERTY(QString follow READ follow WRITE setFollow NOTIFY followChanged) @@ -72,7 +36,7 @@ public: ParticleSize = -2//Anything less than 0 will do }; Q_ENUM(EmitSize) - explicit QQuickTrailEmitter(QQuickItem *parent = 0); + explicit QQuickTrailEmitter(QQuickItem *parent = nullptr); void emitWindow(int timeStamp) override; void reset() override; @@ -102,7 +66,9 @@ public: } Q_SIGNALS: - void emitFollowParticles(const QJSValue &particles, const QJSValue &followed); + void emitFollowParticles( + const QList<QQuickV4ParticleData> &particles, + const QQuickV4ParticleData &followed); void particlesPerParticlePerSecondChanged(int arg); |