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

Documentation tweaks in QDate(Time)?::toString()

Browse Source 
Include the \since markers they need, plus changes in past versions.
Purge a stray blank line.

Pick-to: 6.2
Change-Id: I4edaa0ffaf59323e0af6412727f2a85866813ab8
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 8c178a540faf27fdab6977b13507d94735f89e21)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 5bff9b1ec04aa3c4a80bd8d2f99429a108905867)
(cherry picked from commit 0dbfefc9eed7ad7bb8341415dc69cfe19ac53ba6)
This commit is contained in:
Edward Welbourne 2024-01-30 11:38:45 +01:00 committed by Qt Cherry-pick Bot
parent dcd6d6586b
commit 607165ede3
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1140,12 +1140,14 @@ QString QDate::toString(Qt::DateFormat format) const
/*! /*!
\fn QString QDate::toString(const QString &format, QCalendar cal) const \fn QString QDate::toString(const QString &format, QCalendar cal) const
\fn QString QDate::toString(QStringView format, QCalendar cal) const \fn QString QDate::toString(QStringView format, QCalendar cal) const
\since 5.14
Returns the date as a string. The \a format parameter determines the format Returns the date as a string. The \a format parameter determines the format
of the result string. If \a cal is supplied, it determines the calendar used of the result string. If \a cal is supplied, it determines the calendar used
to represent the date; it defaults to Gregorian. to represent the date; it defaults to Gregorian. Prior to Qt 5.14, there was
no \a cal parameter and the Gregorian calendar was always used.
These expressions may be used: These expressions may be used in the \a format parameter:
\table \table
\header \li Expression \li Output \header \li Expression \li Output
@ -1196,7 +1198,6 @@ QString QDate::toString(Qt::DateFormat format) const
in May will contribute \c{"MayMay05"} to the output. in May will contribute \c{"MayMay05"} to the output.
\sa fromString(), QDateTime::toString(), QTime::toString(), QLocale::toString() \sa fromString(), QDateTime::toString(), QTime::toString(), QLocale::toString()
*/ */
QString QDate::toString(QStringView format, QCalendar cal) const QString QDate::toString(QStringView format, QCalendar cal) const
{ {
@ -4109,12 +4110,14 @@ QString QDateTime::toString(Qt::DateFormat format) const
/*! /*!
\fn QString QDateTime::toString(const QString &format, QCalendar cal) const \fn QString QDateTime::toString(const QString &format, QCalendar cal) const
\fn QString QDateTime::toString(QStringView format, QCalendar cal) const \fn QString QDateTime::toString(QStringView format, QCalendar cal) const
\since 5.14
Returns the datetime as a string. The \a format parameter determines the Returns the datetime as a string. The \a format parameter determines the
format of the result string. If \a cal is supplied, it determines the calendar format of the result string. If \a cal is supplied, it determines the
used to represent the date; it defaults to Gregorian. See QTime::toString() calendar used to represent the date; it defaults to Gregorian. Prior to Qt
and QDate::toString() for the supported specifiers for time and date, 5.14, there was no \a cal parameter and the Gregorian calendar was always
respectively. used. See QTime::toString() and QDate::toString() for the supported
specifiers for time and date, respectively, in the \a format parameter.
Any sequence of characters enclosed in single quotes will be included Any sequence of characters enclosed in single quotes will be included
verbatim in the output string (stripped of the quotes), even if it contains verbatim in the output string (stripped of the quotes), even if it contains