From 59bf9160cc285bac1732fd3ade2ac033b2348b28 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Thu, 14 Sep 2023 17:31:17 +0200
Subject: [PATCH] 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>
---
 src/corelib/time/qtimezoneprivate_tz.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);