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

Conflicts:
	src/corelib/tools/qsimd_p.h
	src/network/socket/qnativesocketengine_winrt.cpp

Change-Id: I2765b671664c2a84839b2f88ba724fdf0c1fa7c6

1 files changed, 0 insertions, 22 deletions

diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp
index 3a5f0f18a1..c869c4e089 100644
--- a/src/corelib/tools/qsimd.cpp
+++ b/src/corelib/tools/qsimd.cpp
@@ -751,26 +751,4 @@ void qDumpCPUFeatures()
     puts("");
 }
 
-/*!
-    \internal
-    \fn T qUnalignedLoad(const void *ptr)
-    \since 5.6.1
-
-    Loads a \c{T} from address \a ptr, which may be misaligned.
-
-    Use of this function avoid the undefined behavior that the C++ standard
-    otherwise attributes to unaligned loads.
-*/
-
-/*!
-    \internal
-    \fn void qUnalignedStore(void *ptr, T t)
-    \since 5.6.1
-
-    Stores \a t to address \a ptr, which may be misaligned.
-
-    Use of this function avoid the undefined behavior that the C++ standard
-    otherwise attributes to unaligned stores.
-*/
-
 QT_END_NAMESPACE