diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-25 10:32:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-25 10:32:29 +0100 |
| commit | 50aeedd86ce0244fbb77ebefdce8da72db881e45 (patch) | |
| tree | 209b0e39b8bde2e43da9497ab327767679ebbdb6 /src/corelib/tools/qdatetime.cpp | |
| parent | 08dea594fe4a55d7546a17773f84f44de2c2d200 (diff) | |
| parent | 17d72c783747dd8d9ce767002988d5d5a54a790e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
mkspecs/features/qml_module.prf
src/corelib/tools/qdatetimeparser_p.h
Change-Id: I5382cee3ddb33107dc61ee20f7a9188c4a68a882
Diffstat (limited to 'src/corelib/tools/qdatetime.cpp')
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index e2fbe6ae60..21080ad3c9 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -3633,7 +3633,7 @@ QString QDateTime::toString(Qt::DateFormat format) const \li the abbreviated localized day name (e.g. 'Mon' to 'Sun'). Uses the system locale to localize the name, i.e. QLocale::system(). \row \li dddd - \li the long localized day name (e.g. 'Monday' to 'Qt::Sunday'). + \li the long localized day name (e.g. 'Monday' to 'Sunday'). Uses the system locale to localize the name, i.e. QLocale::system(). \row \li M \li the month as number without a leading zero (1-12) \row \li MM \li the month as number with a leading zero (01-12) |