diff options
Diffstat (limited to 'src/quick/items/qquickitemanimation_p.h')
-rw-r--r-- | src/quick/items/qquickitemanimation_p.h | 55 |
1 files changed, 6 insertions, 49 deletions
diff --git a/src/quick/items/qquickitemanimation_p.h b/src/quick/items/qquickitemanimation_p.h index ee4df1b6ca..e2ea93dd60 100644 --- a/src/quick/items/qquickitemanimation_p.h +++ b/src/quick/items/qquickitemanimation_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 QQUICKITEMANIMATION_H #define QQUICKITEMANIMATION_H @@ -58,7 +22,7 @@ QT_BEGIN_NAMESPACE class QQuickParentAnimationPrivate; -class Q_AUTOTEST_EXPORT QQuickParentAnimation : public QQuickAnimationGroup +class Q_QUICK_EXPORT QQuickParentAnimation : public QQuickAnimationGroup { Q_OBJECT Q_DECLARE_PRIVATE(QQuickParentAnimation) @@ -71,7 +35,6 @@ class Q_AUTOTEST_EXPORT QQuickParentAnimation : public QQuickAnimationGroup public: QQuickParentAnimation(QObject *parent=nullptr); - virtual ~QQuickParentAnimation(); QQuickItem *target() const; void setTargetObject(QQuickItem *); @@ -95,7 +58,7 @@ protected: }; class QQuickAnchorAnimationPrivate; -class Q_AUTOTEST_EXPORT QQuickAnchorAnimation : public QQuickAbstractAnimation +class Q_QUICK_EXPORT QQuickAnchorAnimation : public QQuickAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickAnchorAnimation) @@ -107,7 +70,6 @@ class Q_AUTOTEST_EXPORT QQuickAnchorAnimation : public QQuickAbstractAnimation public: QQuickAnchorAnimation(QObject *parent=nullptr); - virtual ~QQuickAnchorAnimation(); QQmlListProperty<QQuickItem> targets(); @@ -133,9 +95,10 @@ protected: class QQuickItem; class QQuickPath; class QQuickPathAnimationPrivate; -class Q_AUTOTEST_EXPORT QQuickPathAnimation : public QQuickAbstractAnimation +class Q_QUICK_EXPORT QQuickPathAnimation : public QQuickAbstractAnimation { Q_OBJECT + Q_DISABLE_COPY_MOVE(QQuickPathAnimation) Q_DECLARE_PRIVATE(QQuickPathAnimation) Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged) @@ -211,10 +174,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickParentAnimation) -QML_DECLARE_TYPE(QQuickAnchorAnimation) -#if QT_CONFIG(quick_path) -QML_DECLARE_TYPE(QQuickPathAnimation) -#endif - #endif // QQUICKITEMANIMATION_H |