1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Q(Date|Time)+::(to|from)String(): use C locale from Qt 6

Browse Source 
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>
This commit is contained in:
Edward Welbourne 2016-09-08 19:24:04 +02:00
parent 6bceb4a8a9
commit 4ed59b90a1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/tools/qdatetime.cpp
View File

@ -926,7 +926,7 @@ QString QDate::toString(Qt::DateFormat format) const
*/ */
QString QDate::toString(const QString& 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 #endif //QT_NO_DATESTRING
@ -1328,6 +1328,7 @@ QDate QDate::fromString(const QString &string, const QString &format)
QDate date; QDate date;
#ifndef QT_BOOTSTRAPPED #ifndef QT_BOOTSTRAPPED
QDateTimeParser dt(QVariant::Date, QDateTimeParser::FromString); QDateTimeParser dt(QVariant::Date, QDateTimeParser::FromString);
// dt.setDefaultLocale(QLocale::c()); ### Qt 6
if (dt.parseFormat(format)) if (dt.parseFormat(format))
dt.fromString(string, &date, 0); dt.fromString(string, &date, 0);
#else #else
@ -1664,7 +1665,7 @@ QString QTime::toString(Qt::DateFormat format) const
*/ */
QString QTime::toString(const QString& 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 #endif //QT_NO_DATESTRING
/*! /*!
@ -2014,6 +2015,7 @@ QTime QTime::fromString(const QString &string, const QString &format)
QTime time; QTime time;
#ifndef QT_BOOTSTRAPPED #ifndef QT_BOOTSTRAPPED
QDateTimeParser dt(QVariant::Time, QDateTimeParser::FromString); QDateTimeParser dt(QVariant::Time, QDateTimeParser::FromString);
// dt.setDefaultLocale(QLocale::c()); ### Qt 6
if (dt.parseFormat(format)) if (dt.parseFormat(format))
dt.fromString(string, 0, &time); dt.fromString(string, 0, &time);
#else #else
@ -3876,7 +3878,7 @@ QString QDateTime::toString(Qt::DateFormat format) const
*/ */
QString QDateTime::toString(const QString& 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 #endif //QT_NO_DATESTRING
@ -4927,6 +4929,7 @@ QDateTime QDateTime::fromString(const QString &string, const QString &format)
QDate date; QDate date;
QDateTimeParser dt(QVariant::DateTime, QDateTimeParser::FromString); QDateTimeParser dt(QVariant::DateTime, QDateTimeParser::FromString);
// dt.setDefaultLocale(QLocale::c()); ### Qt 6
if (dt.parseFormat(format) && dt.fromString(string, &date, &time)) if (dt.parseFormat(format) && dt.fromString(string, &date, &time))
return QDateTime(date, time); return QDateTime(date, time);
#else #else