From bd9e40b14cfa3b2459dabcfa60b7e9d23fc76b2a Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 6 Sep 2024 09:21:48 +0200 Subject: [PATCH] Fix compilation with QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST You cannot direct-initialize a pointer variable with a comma expression. Need to wrap it in an extra set of (). Instead of that, wrap with {} on the outside, to make it look less like Lisp. Amends 0ed039fd134fb8025236847295681f13f1775847. On dev, a follow-up change has already removed the code in question, leaving only 6.8 affected. Change-Id: I8d03093849d0bd7b868703218b48b5cb9d2a18f4 Reviewed-by: Ivan Solovev --- src/corelib/tools/qshareddata.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h index bb0ef6ad9fa..4aaa555796c 100644 --- a/src/corelib/tools/qshareddata.h +++ b/src/corelib/tools/qshareddata.h @@ -162,7 +162,7 @@ public: Q_NODISCARD_CTOR QExplicitlySharedDataPointer(const QExplicitlySharedDataPointer &o) noexcept #ifdef QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST - : d(warnIfQExplicitlySharedDataPointerStaticCastMacroDefined(), static_cast(o.data())) + : d{(warnIfQExplicitlySharedDataPointerStaticCastMacroDefined(), static_cast(o.data()))} #else : d(o.data()) #endif