From 58b08ba40b849864ceb2c08f65b0be08ac6fa47a Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sun, 22 Sep 2013 19:01:49 -0700
Subject: Fix conversion from 8-bit to QString without proper encoding

Found by ICC.

Change-Id: Icd89e7df828afdb2acf2c46e00698ef04d5d94c9
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: John Layt <jlayt@kde.org>
---
 src/corelib/tools/qdatetime.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/corelib/tools')

diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index ac9639385a..d64d929d5a 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -4898,7 +4898,7 @@ QDebug operator<<(QDebug dbg, const QDateTime &date)
         break;
     case Qt::TimeZone:
 #ifndef QT_BOOTSTRAPPED
-        spec = QStringLiteral(" Qt::TimeZone ") + date.timeZone().id();
+        spec = QStringLiteral(" Qt::TimeZone ") + QString::fromLatin1(date.timeZone().id());
         break;
 #endif // QT_BOOTSTRAPPED
     case Qt::LocalTime:
-- 
cgit v1.2.3