summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMehdi Fekari <mfekari@rim.com>2013-06-14 10:56:06 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-20 16:06:35 (GMT)
commitb599204accb88abe5a21dd868a961719e1fda1a0 (patch)
tree799a58da6aa76b65a70eeb9f5816c9344a78d69b /src
parent03eee230574c64a9887b3e562b501f21152e0a7b (diff)
downloadQt-b599204accb88abe5a21dd868a961719e1fda1a0.zip
Qt-b599204accb88abe5a21dd868a961719e1fda1a0.tar.gz
Qt-b599204accb88abe5a21dd868a961719e1fda1a0.tar.bz2
QSystemLocale: Fix the time format on BlackBerry 10
The time format should depend on the device settings (24 hour format) cherry picked from qtbase/686c94c892006a3e72291ca8971aabf18ea1ec85 Change-Id: I6226486ee1feedc27fab49802a0043619e83659c Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qlocale_blackberry.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale_blackberry.cpp b/src/corelib/tools/qlocale_blackberry.cpp
index 14f1a52..1df6627 100644
--- a/src/corelib/tools/qlocale_blackberry.cpp
+++ b/src/corelib/tools/qlocale_blackberry.cpp
@@ -289,9 +289,9 @@ QVariant QSystemLocale::query(QueryType type, QVariant in) const
case DateToStringShort:
return lc_region.toString(in.toDate(), QLocale::ShortFormat);
case TimeToStringLong:
- return lc_region.toString(in.toTime(), QLocale::LongFormat);
+ return lc_region.toString(in.toTime(), d->timeFormat(QLocale::LongFormat).toString());
case TimeToStringShort:
- return lc_region.toString(in.toTime(), QLocale::ShortFormat);
+ return lc_region.toString(in.toTime(), d->timeFormat(QLocale::ShortFormat).toString());
case DateTimeToStringShort:
return lc_region.toString(in.toDateTime(), d->dateTimeFormat(QLocale::ShortFormat).toString());
case DateTimeToStringLong: