summaryrefslogtreecommitdiffstats
path: root/src/corelib/text/qlocale.h
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-07-16 17:28:25 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-07-23 11:05:15 +0200
commitcbae0301c721a2767b4626138f4a7c0c69c487d4 (patch)
tree62d6419d69741f461ad3b9b84500af89623cac02 /src/corelib/text/qlocale.h
parentdb0dc4f1db1094cfa0f27c3085aada0a0cf68cc6 (diff)
QLocale: purge deprecated API
Since 5.15 - toTime() with a calendar in the argument list The calendar was never used. Change-Id: I37897d47b42e69d1a8312e6389d6349febb889ae Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/text/qlocale.h')
-rw-r--r--src/corelib/text/qlocale.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h
index ee7e978e48..f4a36123b6 100644
--- a/src/corelib/text/qlocale.h
+++ b/src/corelib/text/qlocale.h
@@ -1030,12 +1030,6 @@ public:
QDateTime toDateTime(const QString &string, FormatType format, QCalendar cal) const;
QDate toDate(const QString &string, const QString &format, QCalendar cal) const;
QDateTime toDateTime(const QString &string, const QString &format, QCalendar cal) const;
-# if QT_DEPRECATED_SINCE(5, 15)
- QT_DEPRECATED_X("Calendar is ignored when parsing times")
- QTime toTime(const QString &string, FormatType format, QCalendar cal) const;
- QT_DEPRECATED_X("Calendar is ignored when parsing times")
- QTime toTime(const QString &string, const QString &format, QCalendar cal) const;
-# endif // 5.15
#endif
QString decimalPoint() const;