From 0f23f9c136cd74b63e46196d390350d4ad3c8aa8 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 20 Sep 2024 11:01:43 +0200 Subject: [PATCH] qendian_p.h: fix -Wunused-const-variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mark QSpecialIntegerBitfieldZero as inline to avoid the warning. Amends 38002df2065d3730defe3513f73088b444e68139, but not picking to 5.15, because inline variables are a C++17 feature. Pick-to: 6.5 6.2 Change-Id: Ib10821f575e1c00061bb02592e4ac5462284d515 Reviewed-by: Øystein Heskestad Reviewed-by: Lena Biliaieva Reviewed-by: Thiago Macieira (cherry picked from commit beda65ba9f4252b83aeeb3099465de7cce005fe2) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qendian_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/global/qendian_p.h b/src/corelib/global/qendian_p.h index efa962937ff..1789e54ac84 100644 --- a/src/corelib/global/qendian_p.h +++ b/src/corelib/global/qendian_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE enum class QSpecialIntegerBitfieldInitializer {}; -constexpr QSpecialIntegerBitfieldInitializer QSpecialIntegerBitfieldZero{}; +constexpr inline QSpecialIntegerBitfieldInitializer QSpecialIntegerBitfieldZero{}; template class QSpecialIntegerStorage