1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QPluginLoader: fix indentation and comments

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2021-11-04 20:44:02 -07:00
parent 4fe71db2ee
commit 8790142aeb
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/plugin/qplugin.h
View File

@ -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;

2
tests/auto/corelib/plugin/qpluginloader/fakeplugin.cpp
View File

@ -51,7 +51,7 @@ static constexpr bool IsDebug = false;
#if defined(__ELF__) && PLUGIN_VERSION >= 1
// GCC will produce:
// fakeplugin.cpp:64:3: warning: ‘no_sanitize_address’ attribute ignored [-Wattributes]
// fakeplugin.cpp:64:3: warning: ‘no_sanitize’ attribute ignored [-Wattributes]
__attribute__((section(".note.qt.metadata"), used, no_sanitize("address"), aligned(sizeof(void*))))
static const struct {
unsigned n_namesz = sizeof(name);