| blob | 800f4a56e4b008d83cb8d406e408510d3a5fd124 |
1 diff -Nru qt-everywhere-src-6.3.2.orig/qtbase/src/corelib/plugin/qplugin.h qt-everywhere-src-6.3.2/qtbase/src/corelib/plugin/qplugin.h
2 --- qt-everywhere-src-6.3.2.orig/qtbase/src/corelib/plugin/qplugin.h 2023-09-19 16:19:55.659890584 +0200
3 +++ qt-everywhere-src-6.3.2/qtbase/src/corelib/plugin/qplugin.h 2023-09-19 16:23:09.763222161 +0200
4 @@ -174,13 +174,6 @@
5 // Since Qt 6.3
6 template <auto (&PluginMetaData)> class QPluginMetaDataV2
7 {
8 - struct ElfNotePayload : QPluginMetaData::ElfNoteHeader {
9 - static constexpr size_t HeaderOffset = offsetof(QPluginMetaData::ElfNoteHeader, header);
10 - quint8 payload[sizeof(PluginMetaData)] = {};
11 - constexpr ElfNotePayload() : ElfNoteHeader(sizeof(PluginMetaData))
12 - { QPluginMetaData::copy(payload, PluginMetaData); }
13 - };
14 -
15 struct RegularPayload : QPluginMetaData::MagicHeader {
16 static constexpr size_t HeaderOffset = offsetof(QPluginMetaData::MagicHeader, header);
17 quint8 payload[sizeof(PluginMetaData)] = {};
18 @@ -197,16 +190,6 @@
19 #if defined(QT_STATICPLUGIN)
20 # define QT_PLUGIN_METADATAV2_SECTION
21 using Payload = StaticPayload;
22 -#elif defined(Q_OF_ELF)
23 -# ifdef Q_CC_CLANG
24 -# define QT_PLUGIN_METADATAV2_SECTION \
25 - __attribute__((section(".note.qt.metadata"), used, aligned(alignof(void *)), \
26 - no_sanitize("address")))
27 -# else
28 -# define QT_PLUGIN_METADATAV2_SECTION \
29 - __attribute__((section(".note.qt.metadata"), used, aligned(alignof(void *))))
30 -# endif
31 - using Payload = ElfNotePayload;
32 #else
33 # define QT_PLUGIN_METADATAV2_SECTION QT_PLUGIN_METADATA_SECTION
34 using Payload = RegularPayload;