diff options
| author | Janne Juntunen <janne.juntunen@qt.io> | 2021-11-03 13:04:07 +0200 |
|---|---|---|
| committer | Janne Juntunen <janne.juntunen@qt.io> | 2021-11-30 14:37:52 +0200 |
| commit | 2bfa4b9960f283396427828deac6f194893cc811 (patch) | |
| tree | 20b0a98726e000cb8ff8a82da246eb985a6e1c61 /src/corelib/plugin/qlibrary.cpp | |
| parent | b9f7add531ceab2590e2b24dec7b495950f9870a (diff) | |
QNX: check and use elf.h from alternative location
In QNX, instead of #include <elf.h>, we have to use #include <sys/elf.h>
since that file is placed in a subdirectory.
Also removed the previous workaround.
Fixes: QTBUG-97833
Change-Id: Id932a5eeb618a42c8778459cdfd8bb5bf903523c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/plugin/qlibrary.cpp')
| -rw-r--r-- | src/corelib/plugin/qlibrary.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index d4ee833554..9f89abdf01 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -203,7 +203,7 @@ static QLibraryScanResult qt_find_pattern(const char *s, qsizetype s_len, QStrin More importantly, the pattern string may exist in the debug information due to it being used in the plugin in the first place. */ -#if defined (Q_OF_ELF) && __has_include(<elf.h>) +#if defined(Q_OF_ELF) return QElfParser::parse({s, s_len}, errMsg); #elif defined(Q_OF_MACH_O) return QMachOParser::parse(s, s_len, errMsg); |