diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:52 +0200 |
| commit | 881ceeff428c377d02ae3881beccdbb028385075 (patch) | |
| tree | 65bd4335d7f67b81b04e33f2cbb17a41cf966dd8 /src/corelib/tools/qtimezoneprivate_tz.cpp | |
| parent | b3d2c867ed14cd6337d5e32b8750f198b5b7d331 (diff) | |
| parent | 106487387d493dab934e19b33bfed55b8df62d67 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
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 f93b17f505..d1ef769414 100644 --- a/src/corelib/tools/qtimezoneprivate_tz.cpp +++ b/src/corelib/tools/qtimezoneprivate_tz.cpp @@ -940,9 +940,9 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const QString line; while (ianaId.isEmpty() && !ts.atEnd() && ts.status() == QTextStream::Ok) { line = ts.readLine(); - if (line.left(5) == QStringLiteral("ZONE=")) { + if (line.startsWith(QLatin1String("ZONE="))) { ianaId = line.mid(6, line.size() - 7).toUtf8(); - } else if (line.left(9) == QStringLiteral("TIMEZONE=")) { + } else if (line.startsWith(QLatin1String("TIMEZONE="))) { ianaId = line.mid(10, line.size() - 11).toUtf8(); } } |