diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-09-22 19:01:49 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-23 19:38:12 +0200 |
| commit | 58b08ba40b849864ceb2c08f65b0be08ac6fa47a (patch) | |
| tree | bba6ef433b4c2fedb00dd71473a9df90c563dfc9 /src/corelib/tools | |
| parent | 645f9d959ff1c167f91bf041e0fa59b97fa97dd7 (diff) | |
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>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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: |