From 27f16490fa40a4751f420070cbf75f8af0c1f3d4 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Mon, 13 Jan 2025 02:10:44 +0200 Subject: [PATCH] Include climits explicitly instead of relying on transitive includes Pick-to: 6.8 6.5 Change-Id: Ib55b337aa6e0a93c7ac7ee9bf492784cc81808d7 Reviewed-by: Marc Mutz (cherry picked from commit 158f2c95c8b69f586bd1155fc5993bdb61f76e77) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/thread/qfutureinterface.cpp | 2 ++ src/corelib/thread/qthreadpool.cpp | 1 + .../platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.h | 2 ++ 3 files changed, 5 insertions(+) diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp index b967f4e6290..280615bf76a 100644 --- a/src/corelib/thread/qfutureinterface.cpp +++ b/src/corelib/thread/qfutureinterface.cpp @@ -12,6 +12,8 @@ #include #include +#include // For INT_MAX + // GCC 12 gets confused about QFutureInterfaceBase::state, for some non-obvious // reason // warning: ‘unsigned int __atomic_or_fetch_4(volatile void*, unsigned int, int)’ writing 4 bytes into a region of size 0 overflows the destination [-Wstringop-overflow=] diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp index f326ed21229..a975efde607 100644 --- a/src/corelib/thread/qthreadpool.cpp +++ b/src/corelib/thread/qthreadpool.cpp @@ -9,6 +9,7 @@ #include #include +#include // For INT_MAX #include using namespace std::chrono_literals; diff --git a/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.h b/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.h index bf99dc037f0..6a608d3851b 100644 --- a/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.h +++ b/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.h @@ -18,6 +18,8 @@ #include #include +#include // For UINT_MAX + QT_BEGIN_NAMESPACE class QVkKhrDisplayVulkanInstance : public QBasicPlatformVulkanInstance