diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-04 20:44:02 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-05 21:13:35 -0700 |
| commit | 8790142aebf22a9e0397ec63dfc7bad72a1ee7a6 (patch) | |
| tree | 08c82f5a7efd9e8094af8cfc4b779e28600b349b /src/corelib/plugin | |
| parent | 4fe71db2ee0db2eab3d1927a1904635a3d26970f (diff) | |
QPluginLoader: fix indentation and comments
Indetnation was bad in commit 0ab3c5c2505dcfa684fd4a3961f24345de7e1d6f
and was missed in code review and one comment wasn't updated when the
code was.
Take the opportunity to remove an old TODO that has been completed for
years.
Change-Id: Ice04365c72984d07a64dfffd16b4899604513680
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'src/corelib/plugin')
| -rw-r--r-- | src/corelib/plugin/qplugin.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h index 35af6205cc..6efdcfe7f6 100644 --- a/src/corelib/plugin/qplugin.h +++ b/src/corelib/plugin/qplugin.h @@ -160,7 +160,6 @@ void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin staticPlugin); # define QT_PLUGIN_METADATA_SECTION \ __attribute__ ((section (".qtmetadata"))) __attribute__((used)) #elif defined(Q_OS_MAC) -// TODO: Implement section parsing on Mac # define QT_PLUGIN_METADATA_SECTION \ __attribute__ ((section ("__TEXT,qtmetadata"))) __attribute__((used)) #elif defined(Q_CC_MSVC) @@ -200,12 +199,11 @@ template <auto (&PluginMetaData)> class QPluginMetaDataV2 using Payload = StaticPayload; #elif defined(Q_OF_ELF) # ifdef Q_CC_CLANG -// the metadata section doesn't work well with clang's sanitizer - QTBUG-97941 -# define QT_PLUGIN_METADATAV2_SECTION \ - __attribute__((section(".note.qt.metadata"), used, aligned(alignof(void *)), \ +# define QT_PLUGIN_METADATAV2_SECTION \ + __attribute__((section(".note.qt.metadata"), used, aligned(alignof(void *)), \ no_sanitize("address"))) # else -# define QT_PLUGIN_METADATAV2_SECTION \ +# define QT_PLUGIN_METADATAV2_SECTION \ __attribute__((section(".note.qt.metadata"), used, aligned(alignof(void *)))) # endif using Payload = ElfNotePayload; |