diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2023-01-03 11:13:05 -0300 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2023-01-06 14:31:38 -0300 |
commit | a2fe33203344e5c47da4da7d1083909e472ca2cf (patch) | |
tree | e68a6b2db9f94efbe11ebd2202ab2800a4b4319f /src/corelib/thread | |
parent | dd7931d580de2d2af5411e0621a61af7345f188b (diff) |
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 <alexey.edelev@qt.io>
Diffstat (limited to 'src/corelib/thread')
-rw-r--r-- | src/corelib/thread/qmutex_p.h | 2 | ||||
-rw-r--r-- | src/corelib/thread/qthread_p.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h index e5932d0a66..565de31ca0 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 b647964056..9aa0b3ea22 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<QPostEvent> { public: |