diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-11-12 15:56:20 -0800 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2017-11-14 16:51:26 +0000 |
| commit | a066ad32b6ef87b8882642495dcabaa3ac1a0819 (patch) | |
| tree | 74e1109e30d2ce73e9b742c09b69e25c407f6d3d /src/corelib | |
| parent | 285596ee199ae1767fc48a0d0c2d12b178c0234d (diff) | |
QDateTime: Move the deprecation marker to Qt 5.10
Commit b6a61211280aa6ddd56f107a9795c9824b7702b0 went into dev at around
the time of the 5.10 branching. We apparently got the side of it wrong.
Change-Id: Ic632b4163d784b83951cfffd14f67bec63fbc795
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib')
| -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 adab47fc1f..3b741553d5 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -81,7 +81,7 @@ public: int daysInYear() const; int weekNumber(int *yearNum = Q_NULLPTR) const; -#if QT_DEPRECATED_SINCE(5, 11) && !defined QT_NO_TEXTDATE +#if QT_DEPRECATED_SINCE(5, 10) && !defined QT_NO_TEXTDATE QT_DEPRECATED_X("Use QLocale::monthName or QLocale::standaloneMonthName") static QString shortMonthName(int month, MonthNameType type = DateFormat); QT_DEPRECATED_X("Use QLocale::dayName or QLocale::standaloneDayName") |