diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-21 18:52:54 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-21 18:53:05 (GMT) |
| commit | f922243bbbab238fa63b220eaf74a5f1b429758c (patch) | |
| tree | 7c1d186a185921aca96dc1207c2e4f145229370b /src/corelib | |
| parent | 1f0e2e9825453fc0d8efa91b21afa8e8a9b4951f (diff) | |
| download | Qt-f922243bbbab238fa63b220eaf74a5f1b429758c.zip Qt-f922243bbbab238fa63b220eaf74a5f1b429758c.tar.gz Qt-f922243bbbab238fa63b220eaf74a5f1b429758c.tar.bz2 | |
Compilation on symbian
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qlocale_symbian.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp index b1a7caa..58e3ba8 100644 --- a/src/corelib/tools/qlocale_symbian.cpp +++ b/src/corelib/tools/qlocale_symbian.cpp @@ -841,7 +841,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const return symbianTimeFormat(); case DateTimeFormatLong: case DateTimeFormatShort: - return symbianDateFormat( (type == DateTimeFormatShort) ) + QLatin1Char(' ') + symbianTimeFormat(); + return QString(symbianDateFormat( (type == DateTimeFormatShort) ) + QLatin1Char(' ') + symbianTimeFormat()); case DateToStringShort: case DateToStringLong: return symbianDateToString(in.toDate(), (type == DateToStringShort) ); @@ -851,8 +851,8 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const case DateTimeToStringShort: case DateTimeToStringLong: { const QDateTime dt = in.toDateTime(); - return symbianDateToString(dt.date(), (type == DateTimeToStringShort) ) - + QLatin1Char(' ') + symbianTimeToString(dt.time()); + return QString(symbianDateToString(dt.date(), (type == DateTimeToStringShort) ) + + QLatin1Char(' ') + symbianTimeToString(dt.time())); } case MeasurementSystem: return static_cast<int>(symbianMeasurementSystem()); |