diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-30 13:39:48 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-30 13:39:48 (GMT) |
| commit | 6a907f37d698eadc9cc35712b9cda48ba19e634d (patch) | |
| tree | d1df866f6a19901f5fe0431e5609cfc2d02484a9 /src/corelib/tools | |
| parent | 8097fa53b5e0e6228bd5737de6de8cd77c04dddf (diff) | |
| parent | 8c4edbd04f350294462fd689748de2dd7cc84d47 (diff) | |
| download | Qt-6a907f37d698eadc9cc35712b9cda48ba19e634d.zip Qt-6a907f37d698eadc9cc35712b9cda48ba19e634d.tar.gz Qt-6a907f37d698eadc9cc35712b9cda48ba19e634d.tar.bz2 | |
Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstream
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlocale_symbian.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp index 1660e95..1273d06 100644 --- a/src/corelib/tools/qlocale_symbian.cpp +++ b/src/corelib/tools/qlocale_symbian.cpp @@ -873,9 +873,11 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const } case NegativeSign: case PositiveSign: + break; case AMText: + return qt_TDes2QString(TAmPmName(TAmPm(EAm))); case PMText: - break; + return qt_TDes2QString(TAmPmName(TAmPm(EPm))); default: break; } |