summaryrefslogtreecommitdiffstats
path: root/src/corelib/time/qdatetime.h
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-02-14 18:20:40 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2020-05-08 09:50:51 +0200
commit5ba66c5622e9e0da87a5037399b375d7e8cee554 (patch)
tree0980be47e66b40c21afe10a4f3877fed145711a1 /src/corelib/time/qdatetime.h
parent48e5a375369fb56aeaa5b6c523a0f1c0ee962d8f (diff)
Remove all locale-dependence from Q(Date|Time)+
[ChangeLog][Important Behavior Changes][QDateTime] Removed all locale-dependence from QDate, QTime and QDateTime, including the Qt::DateFormat members that select the formats of the default and system locales and the toString(Qt::DateFormat, QCalendar) overload, which only used its calendar for these formats. All toString() methods now use, and all fromString() methods only recognize, the C locale's names for days and months. Use QLocale's methods if you need to take locale into account. Fixes: QTBUG-80441 Change-Id: I3a8968438741afb00f44262f79659c51e9b06c35 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/time/qdatetime.h')
-rw-r--r--src/corelib/time/qdatetime.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/corelib/time/qdatetime.h b/src/corelib/time/qdatetime.h
index 974627b704..52231e876e 100644
--- a/src/corelib/time/qdatetime.h
+++ b/src/corelib/time/qdatetime.h
@@ -95,11 +95,6 @@ public:
#if QT_CONFIG(datestring)
QString toString(Qt::DateFormat format = Qt::TextDate) const;
-#if QT_DEPRECATED_SINCE(5, 15)
- // Only the deprecated locale-dependent formats use the calendar.
- QT_DEPRECATED_X("Use QLocale or omit the calendar")
- QString toString(Qt::DateFormat format, QCalendar cal) const;
-#endif
#if QT_STRINGVIEW_LEVEL < 2
QString toString(const QString &format) const;