diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-12-23 08:42:37 -0300 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-12-29 17:53:54 -0300 |
| commit | 41b38c802b2b6251bdd65f8bf0d2031c304d70f6 (patch) | |
| tree | b443d19a4eab07ec887f5e4788cd8c82d0fa5b06 /src/corelib/thread | |
| parent | cb62cdbaa670c164710d183bec33e6375ed14850 (diff) | |
Fix improper ELF versions of certain symbols
They got marked as Qt6_PRIVATE_API because of these private header
defining classes that don't follow Qt's naming convention ("mutex",
"condition_variable", "ControlElement"). We have an exclusion for
classes whose name start with Q.
Introduced by 5d903a64aca37ee7c2836e479e175336e9b7ca87 in the old Perl
syncqt and ported over.
Pick-to: 6.5
Fixes: QTBUG-109605
Fixes: QTBUG-109604
Change-Id: I69ecc04064514f939896fffd173369623c960bcc
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qwaitcondition_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/thread/qwaitcondition_p.h b/src/corelib/thread/qwaitcondition_p.h index 0893e9dd35..cfb36ca30b 100644 --- a/src/corelib/thread/qwaitcondition_p.h +++ b/src/corelib/thread/qwaitcondition_p.h @@ -19,6 +19,11 @@ #include <QtCore/QDeadlineTimer> #include <QtCore/private/qglobal_p.h> +// This header always defines a class called "mutex" and one called +// "condition_variable", so those mustn't be used to mark ELF symbol +// visibility. Don't add more classes to this header! +// ELFVERSION:stop + #include <condition_variable> #include <mutex> |