diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:48:39 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:48:42 +0200 |
commit | 840f6a40e6218992b5b9d451ee3c0886a4846c89 (patch) | |
tree | 2b808decc7adf5218b810d2de6b45c5a8b4cfc42 /src/corelib/tools/qlocale_mac.mm | |
parent | 109bf980b37fed405c6c1eb14cb9c83ff897e389 (diff) | |
parent | 2e3870fe37d36ccf4bd84eb90e1d5e08ad00c1bc (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie56539b2e0be611a363b5f15ae5412a78d6945a2
Diffstat (limited to 'src/corelib/tools/qlocale_mac.mm')
-rw-r--r-- | src/corelib/tools/qlocale_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm index deb5d5eb1d..92dfba162c 100644 --- a/src/corelib/tools/qlocale_mac.mm +++ b/src/corelib/tools/qlocale_mac.mm @@ -193,7 +193,7 @@ static QString macToQtFormat(const QString &sys_fmt) // Qt does not support the following options case 'G': // Era (1..5): 4 = long, 1..3 = short, 5 = narrow case 'Y': // Year of Week (1..n): 1..n = padded number - case 'U': // Cyclic Yar Name (1..5): 4 = long, 1..3 = short, 5 = narrow + case 'U': // Cyclic Year Name (1..5): 4 = long, 1..3 = short, 5 = narrow case 'Q': // Quarter (1..4): 4 = long, 3 = short, 1..2 = padded number case 'q': // Standalone Quarter (1..4): 4 = long, 3 = short, 1..2 = padded number case 'w': // Week of Year (1..2): 1..2 = padded number @@ -257,7 +257,7 @@ static QString macToQtFormat(const QString &sys_fmt) case 's': // Seconds (1..2): 1..2 = padded number result += QString(repeat, c); break; - case 'S': // Fractional second (1..n): 1..n = tuncates to decimal places + case 'S': // Fractional second (1..n): 1..n = truncates to decimal places // Qt uses msecs either unpadded or padded to 3 places if (repeat < 3) result += QLatin1Char('z'); |