From 688b006cc8d8d4d9ce1f29049f96d4d590bb60d7 Mon Sep 17 00:00:00 2001 From: John Layt Date: Tue, 15 Oct 2013 16:25:22 +0200 Subject: [PATCH] QTimeZone - Fix finding Linux System Time Zone Extract the correct length sub-string from the /etc/sysconfig/clock file Change-Id: I37b4f625a51b172ed11ecefbd1b7dc562c5bb89d Reviewed-by: Thiago Macieira --- src/corelib/tools/qtimezoneprivate_tz.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp index 62b8f5f7b6..4bf19178fa 100644 --- a/src/corelib/tools/qtimezoneprivate_tz.cpp +++ b/src/corelib/tools/qtimezoneprivate_tz.cpp @@ -883,9 +883,9 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const while (olsenId.isEmpty() && !ts.atEnd() && ts.status() == QTextStream::Ok) { line = ts.readLine(); if (line.left(5) == QStringLiteral("ZONE=")) { - olsenId = line.mid(6, line.size() - 2).toUtf8(); + olsenId = line.mid(6, line.size() - 7).toUtf8(); } else if (line.left(9) == QStringLiteral("TIMEZONE=")) { - olsenId = line.mid(6, line.size() - 2).toUtf8(); + olsenId = line.mid(10, line.size() - 11).toUtf8(); } } }