diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-30 10:33:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-30 10:33:27 +0200 |
| commit | 310ac6b0584875303ec5eab603b60320277ff598 (patch) | |
| tree | 963c4378f1c277c8b0a438596c4b99453dbaf568 /src/shared | |
| parent | 38e5f27de587e6c9cc3b2844af792289afcd2d07 (diff) | |
| parent | fd797fc9441261d0679d60b0af3682966c862875 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/androiddeployqt/main.cpp
Change-Id: I3df907e197b1b976f74562f1a9cce10261f166f3
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/winutils/elfreader.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/shared/winutils/elfreader.cpp b/src/shared/winutils/elfreader.cpp index b175e87d6..ab2242619 100644 --- a/src/shared/winutils/elfreader.cpp +++ b/src/shared/winutils/elfreader.cpp @@ -430,6 +430,8 @@ QList<QByteArray> ElfReader::dependencies() dynamicData += sizeof(quint32); // past d_ptr. const char *name = mapper.start + dynStrOffset + offset; result.push_back(name); + } else { + dynamicData += m_elfData.elfclass == Elf_ELFCLASS64 ? 8 : 4; } } return result; |