From a2fe33203344e5c47da4da7d1083909e472ca2cf Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 3 Jan 2023 11:13:05 -0300 Subject: [PATCH] Fix improper ELF versions of two more classes They got marked as Qt6_PRIVATE_API because of these ARE private classes, however their pointers are used in user code. For QMutexPrivate, because we manipulate the pointer in inline code; for QPostEventList, because it's used in a virtual member function's parameter list. Pick-to: 6.5 Fixes: QTBUG-109605 Change-Id: I69ecc04064514f939896fffd1736d1fa8d3f1768 Reviewed-by: Alexey Edelev --- src/corelib/thread/qmutex_p.h | 2 ++ src/corelib/thread/qthread_p.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h index e5932d0a66e..565de31ca08 100644 --- a/src/corelib/thread/qmutex_p.h +++ b/src/corelib/thread/qmutex_p.h @@ -36,6 +36,8 @@ struct timespec; QT_BEGIN_NAMESPACE +// We manipulate the pointer to this class in inline, atomic code, +// so syncqt mustn't mark them as private, so ELFVERSION:ignore-next class QMutexPrivate { public: diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h index b6479640569..9aa0b3ea22a 100644 --- a/src/corelib/thread/qthread_p.h +++ b/src/corelib/thread/qthread_p.h @@ -58,6 +58,7 @@ inline bool operator<(const QPostEvent &first, const QPostEvent &second) // This class holds the list of posted events. // The list has to be kept sorted by priority +// It's used in a virtual in QCoreApplication, so ELFVERSION:ignore-next class QPostEventList : public QList { public: