diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2019-04-11 12:35:12 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-04-23 17:31:21 +0000 |
commit | 9dfc2aa75d930c6676f901e817bbc8c900a966f5 (patch) | |
tree | d5b412047860da8b53fd8cbb3e327e38402e3c33 /src | |
parent | 40d9ac93e0bf974439ae2abecbcc979c7dc9d06d (diff) |
Purge use of some deprecated methods from QDateTime tests
QDateTime's short names setUtcOffset() and utcOffset() have been
deprecated since 5.2, in favor of setOffsetFromUtc() and
offsetFromUtc().
QDate's shortDayName() and shortMOnthName() have been deprecated since
5.10, in favor of QLocale's dayName() and monthName(). Also, the
tests that were using them are testing methods only present when the
datestring feature is enabled; so condition them on that feature.
Change-Id: Ibfd4b132523ca8fbc1cb163353a44e0500877fd5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/tools/qdatetime.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index 43271b34ed..8b2a60acaa 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -335,7 +335,7 @@ public: inline bool operator>(const QDateTime &other) const { return other < *this; } inline bool operator>=(const QDateTime &other) const { return !(*this < other); } -#if QT_DEPRECATED_SINCE(5, 2) +#if QT_DEPRECATED_SINCE(5, 2) // ### Qt 6: remove QT_DEPRECATED void setUtcOffset(int seconds); QT_DEPRECATED int utcOffset() const; #endif // QT_DEPRECATED_SINCE |