From 82198dd1f7049cec89271b0ea82521752cc13c05 Mon Sep 17 00:00:00 2001
From: Guoqing Zhang <guoqing.zhang@nokia.com>
Date: Wed, 16 Mar 2011 13:10:42 +0200
Subject: Add digit conversion in default format function

Task-number: QTBUG-17993
Reviewed-by: Laszlo Agocs
---
 src/plugins/s60/3_2/3_2.pro         | 1 +
 src/plugins/s60/5_0/5_0.pro         | 1 +
 src/plugins/s60/src/qlocale_3_2.cpp | 2 ++
 3 files changed, 4 insertions(+)

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..ab5d304 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());
 }
-- 
cgit v0.12

