diff options
Diffstat (limited to 'src/corelib/animation')
-rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 2 | ||||
-rw-r--r-- | src/corelib/animation/qabstractanimation.h | 7 | ||||
-rw-r--r-- | src/corelib/animation/qpropertyanimation.cpp | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index 9dd81b2ecd..9d7a256191 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -773,6 +773,7 @@ QAnimationDriver::~QAnimationDriver() } +#if QT_DEPRECATED_SINCE(5, 13) /*! Sets the time at which an animation driver should start at. @@ -799,6 +800,7 @@ qint64 QAnimationDriver::startTime() const { return 0; } +#endif /*! diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h index 25b5726d56..7f2577d7f7 100644 --- a/src/corelib/animation/qabstractanimation.h +++ b/src/corelib/animation/qabstractanimation.h @@ -147,9 +147,10 @@ public: virtual qint64 elapsed() const; - // ### Qt6: Remove these two functions - void setStartTime(qint64 startTime); - qint64 startTime() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED void setStartTime(qint64 startTime); + QT_DEPRECATED qint64 startTime() const; +#endif Q_SIGNALS: void started(); diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp index 28c03553c5..271be248ec 100644 --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -303,6 +303,6 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State newState, } } -#include "moc_qpropertyanimation.cpp" - QT_END_NAMESPACE + +#include "moc_qpropertyanimation.cpp" |