diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:30:02 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:30:02 +0200 |
commit | c4e472ea1037afde7b99d9132a49eb616cad240e (patch) | |
tree | c9e66fdda63a2e5c3f5a944d711e5c9845de33ac /src/corelib/plugin | |
parent | 7b23ebefb2360feb139ff6e10d2253396e58721e (diff) | |
parent | 6c1e352803a6efbd8b14e5296434e22165b65084 (diff) |
Merge remote-tracking branch 'origin/5.7.0' into 5.7
Conflicts:
src/corelib/tools/qsimd_p.h
Change-Id: I7c6bfc5873d97ad7f51a540dd9c18b9359dde59f
Diffstat (limited to 'src/corelib/plugin')
-rw-r--r-- | src/corelib/plugin/qelfparser_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/plugin/qelfparser_p.h b/src/corelib/plugin/qelfparser_p.h index 2ecdc4e786..145f00df43 100644 --- a/src/corelib/plugin/qelfparser_p.h +++ b/src/corelib/plugin/qelfparser_p.h @@ -89,9 +89,9 @@ public: T read(const char *s) { if (m_endian == ElfBigEndian) - return qFromBigEndian<T>(reinterpret_cast<const uchar *>(s)); + return qFromBigEndian<T>(s); else - return qFromLittleEndian<T>(reinterpret_cast<const uchar *>(s)); + return qFromLittleEndian<T>(s); } const char *parseSectionHeader(const char* s, ElfSectionHeader *sh); |