Changeset 852

Timestamp:

May 7, 2011, 6:13:16 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QLocale: Updated OS/2 code to match 4.7 changes.

File:

• trunk/src/corelib/tools/qlocale.cpp (modified) (1 diff)

trunk/src/corelib/tools/qlocale.cpp ¶

@@ -1117 +1117 @@
         case DateTimeFormatLong:
         case DateTimeFormatShort:
-            return
-                  query(type == DateTimeFormatLong ?
+            return (QString)
+                  (query(type == DateTimeFormatLong ?
                         DateFormatLong : DateFormatShort).toString()
                 + QLatin1Char(' ')
                 + query(type == DateTimeFormatLong ?
-                        TimeFormatLong : TimeFormatShort).toString();
+                        TimeFormatLong : TimeFormatShort).toString());
         case DateTimeToStringShort: {
             QDateTime dateTime = in.toDateTime();
-            return
-                  query(DateToStringShort, dateTime.date()).toString()
+            return (QString)
+                  (query(DateToStringShort, dateTime.date()).toString()
                 + QLatin1Char(' ')
-                + query(TimeToStringShort, dateTime.time()).toString();
+                + query(TimeToStringShort, dateTime.time()).toString());
         }
         case DateTimeToStringLong: {