diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-02-02 14:50:19 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-02-05 16:54:33 +0000 |
commit | b76a923a8e81f5fabe6e48ed467e5326275fae4e (patch) | |
tree | 90cbfc55164a25763e1cca23832c9d9a7e9c6494 | |
parent | ae44da62ef30503a5380e5d1ee8b0cadd5960994 (diff) | |
download | qtbase-b76a923a8e81f5fabe6e48ed467e5326275fae4e.tar.gz |
QAnimationDriver: mark obsolete functions as deprecated
Mark the two long obsolete (and empty) functions as deprecated so they
can be removed with Qt6:
- setStartTime()/startTime()
Change-Id: I7ee1d99ff194860e41723909f81adc181a71ec7c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 2 | ||||
-rw-r--r-- | src/corelib/animation/qabstractanimation.h | 7 |
2 files changed, 6 insertions, 3 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(); |