diff options
Diffstat (limited to 'src/quick/util/qquickanimation_p.h')
| -rw-r--r-- | src/quick/util/qquickanimation_p.h | 78 |
1 files changed, 14 insertions, 64 deletions
diff --git a/src/quick/util/qquickanimation_p.h b/src/quick/util/qquickanimation_p.h index f10b457a25..61e52869f5 100644 --- a/src/quick/util/qquickanimation_p.h +++ b/src/quick/util/qquickanimation_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 QQUICKANIMATION_H #define QQUICKANIMATION_H @@ -67,7 +31,7 @@ QT_BEGIN_NAMESPACE class QQuickAbstractAnimationPrivate; class QQuickAnimationGroup; -class Q_QUICK_PRIVATE_EXPORT QQuickAbstractAnimation : public QObject, public QQmlPropertyValueSource, public QQmlParserStatus +class Q_QUICK_EXPORT QQuickAbstractAnimation : public QObject, public QQmlPropertyValueSource, public QQmlParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QQuickAbstractAnimation) @@ -152,8 +116,6 @@ public: QObject *defaultTarget = nullptr); QAbstractAnimationJob* qtAnimation(); -private Q_SLOTS: - void componentFinalized(); private: void setTarget(const QQmlProperty &) override; void notifyRunningChanged(bool running); @@ -163,7 +125,7 @@ private: }; class QQuickPauseAnimationPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickPauseAnimation : public QQuickAbstractAnimation +class Q_QUICK_EXPORT QQuickPauseAnimation : public QQuickAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickPauseAnimation) @@ -190,7 +152,7 @@ protected: }; class QQuickScriptActionPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickScriptAction : public QQuickAbstractAnimation +class Q_QUICK_EXPORT QQuickScriptAction : public QQuickAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickScriptAction) @@ -218,7 +180,7 @@ protected: }; class QQuickPropertyActionPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickPropertyAction : public QQuickAbstractAnimation +class Q_QUICK_EXPORT QQuickPropertyAction : public QQuickAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickPropertyAction) @@ -265,7 +227,7 @@ protected: }; class QQuickPropertyAnimationPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickPropertyAnimation : public QQuickAbstractAnimation +class Q_QUICK_EXPORT QQuickPropertyAnimation : public QQuickAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickPropertyAnimation) @@ -330,7 +292,7 @@ Q_SIGNALS: void propertyChanged(); }; -class Q_QUICK_PRIVATE_EXPORT QQuickColorAnimation : public QQuickPropertyAnimation +class Q_QUICK_EXPORT QQuickColorAnimation : public QQuickPropertyAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickPropertyAnimation) @@ -350,7 +312,7 @@ public: void setTo(const QColor &); }; -class Q_QUICK_PRIVATE_EXPORT QQuickNumberAnimation : public QQuickPropertyAnimation +class Q_QUICK_EXPORT QQuickNumberAnimation : public QQuickPropertyAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickPropertyAnimation) @@ -377,7 +339,7 @@ private: void init(); }; -class Q_QUICK_PRIVATE_EXPORT QQuickVector3dAnimation : public QQuickPropertyAnimation +class Q_QUICK_EXPORT QQuickVector3dAnimation : public QQuickPropertyAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickPropertyAnimation) @@ -399,7 +361,7 @@ public: }; class QQuickRotationAnimationPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickRotationAnimation : public QQuickPropertyAnimation +class Q_QUICK_EXPORT QQuickRotationAnimation : public QQuickPropertyAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickRotationAnimation) @@ -430,7 +392,7 @@ Q_SIGNALS: }; class QQuickAnimationGroupPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickAnimationGroup : public QQuickAbstractAnimation +class Q_QUICK_EXPORT QQuickAnimationGroup : public QQuickAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QQuickAnimationGroup) @@ -449,7 +411,7 @@ protected: QQuickAnimationGroup(QQuickAnimationGroupPrivate &dd, QObject *parent); }; -class Q_QUICK_PRIVATE_EXPORT QQuickSequentialAnimation : public QQuickAnimationGroup +class Q_QUICK_EXPORT QQuickSequentialAnimation : public QQuickAnimationGroup { Q_OBJECT Q_DECLARE_PRIVATE(QQuickAnimationGroup) @@ -468,7 +430,7 @@ protected: QObject *defaultTarget = nullptr) override; }; -class Q_QUICK_PRIVATE_EXPORT QQuickParallelAnimation : public QQuickAnimationGroup +class Q_QUICK_EXPORT QQuickParallelAnimation : public QQuickAnimationGroup { Q_OBJECT Q_DECLARE_PRIVATE(QQuickAnimationGroup) @@ -490,16 +452,4 @@ protected: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickAbstractAnimation) -QML_DECLARE_TYPE(QQuickPauseAnimation) -QML_DECLARE_TYPE(QQuickScriptAction) -QML_DECLARE_TYPE(QQuickPropertyAction) -QML_DECLARE_TYPE(QQuickPropertyAnimation) -QML_DECLARE_TYPE(QQuickColorAnimation) -QML_DECLARE_TYPE(QQuickNumberAnimation) -QML_DECLARE_TYPE(QQuickSequentialAnimation) -QML_DECLARE_TYPE(QQuickParallelAnimation) -QML_DECLARE_TYPE(QQuickVector3dAnimation) -QML_DECLARE_TYPE(QQuickRotationAnimation) - #endif // QQUICKANIMATION_H |