From 4ed59b90a1d91e5fd25bc8d1ddab7e6afe03619e Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Thu, 8 Sep 2016 19:24:04 +0200
Subject: Q(Date|Time)+::(to|from)String(): use C locale from Qt 6

We're using QLocale::system() by default for conversions between
date/time and strings; locale-dependency should be left to QLocale's
methods, so we should switch to using the C locale for the date/time
classes' methods, to make the results locale-independent.

Task-number: QTBUG-55632
Change-Id: I6ea6e8d2289e537f4d26eccf69a4f314c501f116
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/tools/qdatetime.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/corelib/tools/qdatetime.cpp')

diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index e4b28178e8..6aae4ce871 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -926,7 +926,7 @@ QString QDate::toString(Qt::DateFormat format) const
 */
 QString QDate::toString(const QString& format) const
 {
-    return QLocale::system().toString(*this, format);
+    return QLocale::system().toString(*this, format); // QLocale::c() ### Qt6
 }
 #endif //QT_NO_DATESTRING
 
@@ -1328,6 +1328,7 @@ QDate QDate::fromString(const QString &string, const QString &format)
     QDate date;
 #ifndef QT_BOOTSTRAPPED
     QDateTimeParser dt(QVariant::Date, QDateTimeParser::FromString);
+    // dt.setDefaultLocale(QLocale::c()); ### Qt 6
     if (dt.parseFormat(format))
         dt.fromString(string, &date, 0);
 #else
@@ -1664,7 +1665,7 @@ QString QTime::toString(Qt::DateFormat format) const
 */
 QString QTime::toString(const QString& format) const
 {
-    return QLocale::system().toString(*this, format);
+    return QLocale::system().toString(*this, format); // QLocale::c() ### Qt6
 }
 #endif //QT_NO_DATESTRING
 /*!
@@ -2014,6 +2015,7 @@ QTime QTime::fromString(const QString &string, const QString &format)
     QTime time;
 #ifndef QT_BOOTSTRAPPED
     QDateTimeParser dt(QVariant::Time, QDateTimeParser::FromString);
+    // dt.setDefaultLocale(QLocale::c()); ### Qt 6
     if (dt.parseFormat(format))
         dt.fromString(string, 0, &time);
 #else
@@ -3876,7 +3878,7 @@ QString QDateTime::toString(Qt::DateFormat format) const
 */
 QString QDateTime::toString(const QString& format) const
 {
-    return QLocale::system().toString(*this, format);
+    return QLocale::system().toString(*this, format); // QLocale::c() ### Qt6
 }
 #endif //QT_NO_DATESTRING
 
@@ -4927,6 +4929,7 @@ QDateTime QDateTime::fromString(const QString &string, const QString &format)
     QDate date;
 
     QDateTimeParser dt(QVariant::DateTime, QDateTimeParser::FromString);
+    // dt.setDefaultLocale(QLocale::c()); ### Qt 6
     if (dt.parseFormat(format) && dt.fromString(string, &date, &time))
         return QDateTime(date, time);
 #else
-- 
cgit v1.2.3