diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:48:39 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:48:42 +0200 |
| commit | 840f6a40e6218992b5b9d451ee3c0886a4846c89 (patch) | |
| tree | 2b808decc7adf5218b810d2de6b45c5a8b4cfc42 /src/corelib/tools/qtimezoneprivate_tz.cpp | |
| parent | 109bf980b37fed405c6c1eb14cb9c83ff897e389 (diff) | |
| parent | 2e3870fe37d36ccf4bd84eb90e1d5e08ad00c1bc (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie56539b2e0be611a363b5f15ae5412a78d6945a2
Diffstat (limited to 'src/corelib/tools/qtimezoneprivate_tz.cpp')
| -rw-r--r-- | src/corelib/tools/qtimezoneprivate_tz.cpp | 4 |
1 files 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(); } } } |