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

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

Change-Id: If899cda251b4dc8b8a7c6764520e88ab719737cd

1 files changed, 14 insertions, 6 deletions

diff --git a/src/corelib/global/qendian.qdoc b/src/corelib/global/qendian.qdoc
index 3b22dcec87..9ce9dbdb0e 100644
--- a/src/corelib/global/qendian.qdoc
+++ b/src/corelib/global/qendian.qdoc
@@ -35,7 +35,7 @@
 
 /*!
     \internal
-    \fn T qFromUnaligned(const uchar *ptr)
+    \fn T qFromUnaligned(const void *ptr)
     \since 5.5
 
     Loads a \c{T} from address \a ptr, which may be misaligned.
@@ -46,7 +46,7 @@
 
 /*!
     \internal
-    \fn void qToUnaligned(T t, uchar *ptr)
+    \fn void qToUnaligned(T t, void *ptr)
     \since 4.5
 
     Stores \a t to address \a ptr, which may be misaligned.
@@ -57,7 +57,7 @@
 
 
 /*!
-    \fn T qFromBigEndian(const uchar *src)
+    \fn T qFromBigEndian(const void *src)
     \since 4.3
     \relates <QtEndian>
 
@@ -69,6 +69,8 @@
     \note Template type \c{T} can either be a qint16, qint32 or qint64. Other types of
     integers, e.g., qlong, are not applicable.
 
+    \note Since Qt 5.7, the type of the \a src parameter is a void pointer.
+
     There are no data alignment constraints for \a src.
 
     \sa qFromLittleEndian()
@@ -88,7 +90,7 @@
     unmodified.
 */
 /*!
-    \fn T qFromLittleEndian(const uchar *src)
+    \fn T qFromLittleEndian(const void *src)
     \since 4.3
     \relates <QtEndian>
 
@@ -100,6 +102,8 @@
     \note Template type \c{T} can either be a qint16, qint32 or qint64. Other types of
     integers, e.g., qlong, are not applicable.
 
+    \note Since Qt 5.7, the type of the \a src parameter is a void pointer.
+
     There are no data alignment constraints for \a src.
 
     \sa qFromBigEndian()
@@ -119,7 +123,7 @@
     unmodified.
 */
 /*!
-    \fn void qToBigEndian(T src, uchar *dest)
+    \fn void qToBigEndian(T src, void *dest)
     \since 4.3
     \relates <QtEndian>
 
@@ -130,6 +134,8 @@
 
     There are no data alignment constraints for \a dest.
 
+    \note Since Qt 5.7, the type of the \a dest parameter is a void pointer.
+
     \sa qFromBigEndian()
     \sa qFromLittleEndian()
     \sa qToLittleEndian()
@@ -147,7 +153,7 @@
     unmodified.
 */
 /*!
-    \fn void qToLittleEndian(T src, uchar *dest)
+    \fn void qToLittleEndian(T src, void *dest)
     \since 4.3
     \relates <QtEndian>
 
@@ -158,6 +164,8 @@
 
     There are no data alignment constraints for \a dest.
 
+    \note Since Qt 5.7, the type of the \a dest parameter is a void pointer.
+
     \sa qFromBigEndian()
     \sa qFromLittleEndian()
     \sa qToBigEndian()