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

Conflicts:
	src/corelib/tools/qsimd_p.h

Change-Id: I7c6bfc5873d97ad7f51a540dd9c18b9359dde59f

3 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/generic/tuiotouch/qoscbundle.cpp b/src/plugins/generic/tuiotouch/qoscbundle.cpp
index 26dabebd23..6ddca9b09d 100644
--- a/src/plugins/generic/tuiotouch/qoscbundle.cpp
+++ b/src/plugins/generic/tuiotouch/qoscbundle.cpp
@@ -89,9 +89,9 @@ QOscBundle::QOscBundle(const QByteArray &data)
     // (editor's note: one may wonder how a 64bit big-endian number can also be
     // two 32bit numbers, without specifying in which order they occur or
     // anything, and one may indeed continue to wonder.)
-    quint32 oscTimeEpoch = qFromBigEndian<quint32>((const uchar*)data.constData() + parsedBytes);
+    quint32 oscTimeEpoch = qFromBigEndian<quint32>(data.constData() + parsedBytes);
     parsedBytes += sizeof(quint32);
-    quint32 oscTimePico = qFromBigEndian<quint32>((const uchar*)data.constData() + parsedBytes);
+    quint32 oscTimePico = qFromBigEndian<quint32>(data.constData() + parsedBytes);
     parsedBytes += sizeof(quint32);
 
     bool isImmediate = false;
diff --git a/src/plugins/generic/tuiotouch/qoscmessage.cpp b/src/plugins/generic/tuiotouch/qoscmessage.cpp
index 30cf117767..6f82cd784b 100644
--- a/src/plugins/generic/tuiotouch/qoscmessage.cpp
+++ b/src/plugins/generic/tuiotouch/qoscmessage.cpp
@@ -95,7 +95,7 @@ QOscMessage::QOscMessage(const QByteArray &data)
             if (parsedBytes > (quint32)data.size() || data.size() - parsedBytes < sizeof(quint32))
                 return;
 
-            quint32 anInt = qFromBigEndian<quint32>((const uchar*)data.constData() + parsedBytes);
+            quint32 anInt = qFromBigEndian<quint32>(data.constData() + parsedBytes);
             parsedBytes += sizeof(quint32);
 
             // TODO: is int32 in OSC signed, or unsigned?
@@ -109,7 +109,7 @@ QOscMessage::QOscMessage(const QByteArray &data)
                 quint32 u;
                 float f;
             } value;
-            value.u = qFromBigEndian<quint32>((const uchar*)data.constData() + parsedBytes);
+            value.u = qFromBigEndian<quint32>(data.constData() + parsedBytes);
             parsedBytes += sizeof(quint32);
             arguments.append(value.f);
         } else {
diff --git a/src/plugins/platforms/xcb/qxcbxsettings.cpp b/src/plugins/platforms/xcb/qxcbxsettings.cpp
index 899dc0158a..401eb8043c 100644
--- a/src/plugins/platforms/xcb/qxcbxsettings.cpp
+++ b/src/plugins/platforms/xcb/qxcbxsettings.cpp
@@ -158,8 +158,8 @@ public:
 
 #define ADJUST_BO(b, t, x) \
         ((b == LSBFirst) ?                          \
-         qFromLittleEndian<t>((const uchar *)(x)) : \
-         qFromBigEndian<t>((const uchar *)(x)))
+         qFromLittleEndian<t>(x) : \
+         qFromBigEndian<t>(x))
 #define VALIDATE_LENGTH(x)    \
         if ((size_t)xSettings.length() < (offset + local_offset + 12 + x)) { \
             qWarning("Length %d runs past end of data", x); \