summaryrefslogtreecommitdiffstats
path: root/src/corelib/time/qtimezoneprivate_tz.cpp
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2023-09-14 17:31:17 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2023-09-15 21:53:36 +0200
commit59bf9160cc285bac1732fd3ade2ac033b2348b28 (patch)
tree9355b8f54008e03e2fa9c654eba7353192c31872 /src/corelib/time/qtimezoneprivate_tz.cpp
parentccd59b2d4f8f1c4fde3f1498d28c0dc91ba75efd (diff)
Fix warning on invalid time-zone lookup
Amends commit 569dc0de50a46b64763921199a2706ab34d151a9 to still return when no zone file is found with the given name, as the code did before. Attempting to continue past the error was provoking warnings from QIODevice::read(). Pick-to: 6.6.0 6.6 6.5 Task-number: QTBUG-116017 Change-Id: I0e224a6b30a3f32cd925d87ffba4dcb24f9b8568 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/time/qtimezoneprivate_tz.cpp')
-rw-r--r--src/corelib/time/qtimezoneprivate_tz.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
index 2b54cf7a5e..0046782fc9 100644
--- a/src/corelib/time/qtimezoneprivate_tz.cpp
+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
@@ -803,8 +803,8 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId)
if (check.isValid) {
ret.m_hasDst = check.hasDst;
ret.m_posixRule = ianaId;
- return ret;
}
+ return ret;
}
QDataStream ds(&tzif);