diff options
| author | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-06 12:36:15 (GMT) |
|---|---|---|
| committer | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-06 12:36:15 (GMT) |
| commit | 470ae2d9da3bdda0dee4530616e1fdd5f9f00146 (patch) | |
| tree | 84cd79f817b333fb143486d7e994292cd99017d1 /src/plugins/s60 | |
| parent | c20dbae2860d1ec681be50f161792c6aede08b1b (diff) | |
| parent | 38a0780a51123e63b9b5087732bd5078a1bd68ef (diff) | |
| download | Qt-470ae2d9da3bdda0dee4530616e1fdd5f9f00146.zip Qt-470ae2d9da3bdda0dee4530616e1fdd5f9f00146.tar.gz Qt-470ae2d9da3bdda0dee4530616e1fdd5f9f00146.tar.bz2 | |
Merge remote-tracking branch 'qt-master/master'
Diffstat (limited to 'src/plugins/s60')
| -rw-r--r-- | src/plugins/s60/3_2/3_2.pro | 1 | ||||
| -rw-r--r-- | src/plugins/s60/5_0/5_0.pro | 1 | ||||
| -rw-r--r-- | src/plugins/s60/src/qlocale_3_2.cpp | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/s60/3_2/3_2.pro b/src/plugins/s60/3_2/3_2.pro index 0524866..b104c05 100644 --- a/src/plugins/s60/3_2/3_2.pro +++ b/src/plugins/s60/3_2/3_2.pro @@ -16,6 +16,7 @@ contains(S60_VERSION, 3.1) { LIBS += -lDirectoryLocalizer } LIBS += -lefsrv + LIBS += -lnumberconversion INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE } diff --git a/src/plugins/s60/5_0/5_0.pro b/src/plugins/s60/5_0/5_0.pro index 00aea1b..b037215 100644 --- a/src/plugins/s60/5_0/5_0.pro +++ b/src/plugins/s60/5_0/5_0.pro @@ -16,6 +16,7 @@ contains(S60_VERSION, 3.1) { LIBS += -lDirectoryLocalizer } LIBS += -lefsrv + LIBS += -lnumberconversion INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE } diff --git a/src/plugins/s60/src/qlocale_3_2.cpp b/src/plugins/s60/src/qlocale_3_2.cpp index 8c0edd2..ecbf46c 100644 --- a/src/plugins/s60/src/qlocale_3_2.cpp +++ b/src/plugins/s60/src/qlocale_3_2.cpp @@ -42,6 +42,7 @@ #include <exception> #include <e32std.h> #include <e32base.h> +#include <numberconversion.h> EXPORT_C TPtrC defaultGetLongDateFormatSpec(TExtendedLocale& locale) { @@ -61,4 +62,5 @@ EXPORT_C TPtrC defaultGetTimeFormatSpec(TExtendedLocale& locale) EXPORT_C void defaultFormatL(TTime& time, TDes& des, const TDesC& format, const TLocale& locale) { time.FormatL(des, format, locale); + NumberConversion::ConvertDigits(des, locale.DigitType()); } |