From 0260c0d9f51ddad253fe4a57ab5fcb5d22bd50d3 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 17 Sep 2024 14:41:00 +0200 Subject: [PATCH] Change QTimeZonePrivate::invalidSeconds() return type from qint64 to int Inspected all in-tree callers, doesn't change semantics, but fixes a few -Wshorten-64-to-32 Clang warnings (which we unfortunately didn't enable globally upon s/int/qsizetype/). Amends 48e2c3ac3318d4e3b504aadad5f56dc33be8f50d. Not picking back further than 6.8, because I don't want to review historic callers. Task-number: QTBUG-126219 Change-Id: I53c16d630dfffdba3801bf211f1b80d0346dd375 Reviewed-by: Edward Welbourne (cherry picked from commit 4bf1ed802151f8310b9adb56fac6de93f195cc44) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/time/qtimezoneprivate_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/time/qtimezoneprivate_p.h b/src/corelib/time/qtimezoneprivate_p.h index 592a517e6d9..fcaab52db43 100644 --- a/src/corelib/time/qtimezoneprivate_p.h +++ b/src/corelib/time/qtimezoneprivate_p.h @@ -125,7 +125,7 @@ public: { return (std::numeric_limits::min)() + 1; } [[nodiscard]] static constexpr qint64 invalidMSecs() { return (std::numeric_limits::min)(); } - [[nodiscard]] static constexpr qint64 invalidSeconds() + [[nodiscard]] static constexpr int invalidSeconds() { return (std::numeric_limits::min)(); } static QTimeZone::OffsetData invalidOffsetData(); static QTimeZone::OffsetData toOffsetData(const Data &data);