diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-03 01:00:16 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-08-07 17:44:51 +0200 |
| commit | 053e7cce79d4bef99ec85101b0d22bbb171072c5 (patch) | |
| tree | c2059e82cccdea1fd0024c5942d1a834c28d39da /src/corelib/tools/qlocale.cpp | |
| parent | a420d02538d28854914a6978c9637a0ddd652146 (diff) | |
| parent | f271dd8f960ad9f61697dfa57b26c4071441cadc (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/corelib/doc/src/objectmodel/signalsandslots.qdoc
src/plugins/platforms/cocoa/qcocoamenuloader.mm
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection.h
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
tests/auto/gui/image/qimage/tst_qimage.cpp
Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I9bd24ee9b00d4f26c8f344ce3970aa6e93935ff5
Diffstat (limited to 'src/corelib/tools/qlocale.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 7341d196cb..24fd597e52 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -1791,6 +1791,8 @@ QString QLocale::toString(qulonglong i) const Returns a localized string representation of the given \a date in the specified \a format. If \a format is an empty string, an empty string is returned. + + \sa QDate::toString() */ QString QLocale::toString(const QDate &date, const QString &format) const @@ -1805,6 +1807,8 @@ QString QLocale::toString(const QDate &date, const QString &format) const Returns a localized string representation of the given \a date in the specified \a format. If \a format is an empty string, an empty string is returned. + + \sa QDate::toString() */ QString QLocale::toString(const QDate &date, QStringView format) const { @@ -1857,6 +1861,8 @@ static bool timeFormatContainsAP(QStringView format) Returns a localized string representation of the given \a time according to the specified \a format. If \a format is an empty string, an empty string is returned. + + \sa QTime::toString() */ QString QLocale::toString(const QTime &time, const QString &format) const { @@ -1870,6 +1876,8 @@ QString QLocale::toString(const QTime &time, const QString &format) const Returns a localized string representation of the given \a time according to the specified \a format. If \a format is an empty string, an empty string is returned. + + \sa QTime::toString() */ QString QLocale::toString(const QTime &time, QStringView format) const { @@ -1883,6 +1891,8 @@ QString QLocale::toString(const QTime &time, QStringView format) const Returns a localized string representation of the given \a dateTime according to the specified \a format. If \a format is an empty string, an empty string is returned. + + \sa QDateTime::toString(), QDate::toString(), QTime::toString() */ QString QLocale::toString(const QDateTime &dateTime, const QString &format) const @@ -1897,6 +1907,8 @@ QString QLocale::toString(const QDateTime &dateTime, const QString &format) cons Returns a localized string representation of the given \a dateTime according to the specified \a format. If \a format is an empty string, an empty string is returned. + + \sa QDateTime::toString(), QDate::toString(), QTime::toString() */ QString QLocale::toString(const QDateTime &dateTime, QStringView format) const { |