From a13d26d08a5ccce3faabcbc68191da6ae87b6215 Mon Sep 17 00:00:00 2001 From: Frank Osterfeld Date: Tue, 9 Jan 2024 15:58:58 +0100 Subject: [PATCH] Put private helper classes in unnamed namespace Avoids clashes with qtbase's quint24 (qdrawhelper_p.h), which leads to QImage::convertToFormat() to give wrong results. Task-number: QTBUG-120647 Change-Id: If4c932e5afea3c8bb1ac2d669221195fa2642e40 --- src/multimedia/audio/qaudiohelpers.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/multimedia/audio/qaudiohelpers.cpp b/src/multimedia/audio/qaudiohelpers.cpp index 2e31286d7..190508bb1 100644 --- a/src/multimedia/audio/qaudiohelpers.cpp +++ b/src/multimedia/audio/qaudiohelpers.cpp @@ -41,7 +41,7 @@ #include -QT_BEGIN_NAMESPACE +namespace { // Base implementation of 24 bits number. // Used to adjust 3 bytes values by a factor. @@ -85,6 +85,9 @@ public: } }; +} + +QT_BEGIN_NAMESPACE namespace QAudioHelperInternal { -- 2.39.3 (Apple Git-145)