Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp

Change-Id: If899cda251b4dc8b8a7c6764520e88ab719737cd

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