AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Warn about Q(Date|Time)+ switching to C locale in Qt 6

Browse Source 
Change-Id: I3a3afc3fb4ddca405a75097feb15aee0e72b3b19
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2020-02-27 18:19:59 +01:00
parent 84382bde5c
commit 275401f580
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/corelib/time/qdatetime.cpp
View File

@ -1285,6 +1285,10 @@ QT_WARNING_POP
If the datetime is invalid, an empty string will be returned. If the datetime is invalid, an empty string will be returned.
\note If localized month and day names are desired, please switch to using
QLocale::system().toString() as QDate methods shall change to use English (C
locale) names at Qt 6.
\sa fromString(), QDateTime::toString(), QTime::toString(), QLocale::toString() \sa fromString(), QDateTime::toString(), QTime::toString(), QLocale::toString()
*/ */
@ -1786,6 +1790,10 @@ QT_WARNING_POP
\snippet code/src_corelib_tools_qdatetime.cpp 3 \snippet code/src_corelib_tools_qdatetime.cpp 3
\note If localized month and day names are used, please switch to using
QLocale::system().toDate() as QDate methods shall change to only recognize
English (C locale) names at Qt 6.
\sa toString(), QDateTime::fromString(), QTime::fromString(), \sa toString(), QDateTime::fromString(), QTime::fromString(),
QLocale::toDate() QLocale::toDate()
*/ */
@ -2146,6 +2154,10 @@ QT_WARNING_POP
If the time is invalid, an empty string will be returned. If the time is invalid, an empty string will be returned.
If \a format is empty, the default format "hh:mm:ss" is used. If \a format is empty, the default format "hh:mm:ss" is used.
\note If localized forms of am or pm (the AP, ap, A or a formats) are
desired, please switch to using QLocale::system().toString() as QTime
methods shall change to use English (C locale) at Qt 6.
\sa fromString(), QDate::toString(), QDateTime::toString(), QLocale::toString() \sa fromString(), QDate::toString(), QDateTime::toString(), QLocale::toString()
*/ */
QString QTime::toString(QStringView format) const QString QTime::toString(QStringView format) const
@ -2543,6 +2555,10 @@ QT_WARNING_POP
\snippet code/src_corelib_tools_qdatetime.cpp 8 \snippet code/src_corelib_tools_qdatetime.cpp 8
\note If localized forms of am or pm (the AP, ap, A or a formats) are used,
please switch to using QLocale::system().toTime() as QTime methods shall
change to only recognize English (C locale) at Qt 6.
\sa toString(), QDateTime::fromString(), QDate::fromString(), \sa toString(), QDateTime::fromString(), QDate::fromString(),
QLocale::toTime() QLocale::toTime()
*/ */
@ -4465,6 +4481,10 @@ QT_WARNING_POP
If the datetime is invalid, an empty string will be returned. If the datetime is invalid, an empty string will be returned.
\note If localized month and day names are desired, please switch to using
QLocale::system().toString() as QDateTime methods shall change to use
English (C locale) names at Qt 6.
\sa fromString(), QDate::toString(), QTime::toString(), QLocale::toString() \sa fromString(), QDate::toString(), QTime::toString(), QLocale::toString()
*/ */
QString QDateTime::toString(QStringView format) const QString QDateTime::toString(QStringView format) const
@ -5504,6 +5524,10 @@ QT_WARNING_POP
\snippet code/src_corelib_tools_qdatetime.cpp 14 \snippet code/src_corelib_tools_qdatetime.cpp 14
\note If localized month and day names are used, please switch to using
QLocale::system().toDateTime() as QDateTime methods shall change to only
recognize English (C locale) names at Qt 6.
\sa toString(), QDate::fromString(), QTime::fromString(), \sa toString(), QDate::fromString(), QTime::fromString(),
QLocale::toDateTime() QLocale::toDateTime()
*/ */