diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-26 09:40:39 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-05-26 13:04:32 +0200 |
commit | 2fb026d58b45f50ed7d5666de58c9184e81bbc60 (patch) | |
tree | ad1a80d7e2579899c55fce7771472a7d9176af0e /src/corelib/mimetypes/qmimemagicrule.cpp | |
parent | 184b2ea4ea9c3e4ad735ff67c5a399e9613da8ab (diff) | |
parent | 540978288ea0f6ed0b166bb9207f427a4c825ab6 (diff) |
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
Diffstat (limited to 'src/corelib/mimetypes/qmimemagicrule.cpp')
-rw-r--r-- | src/corelib/mimetypes/qmimemagicrule.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/mimetypes/qmimemagicrule.cpp b/src/corelib/mimetypes/qmimemagicrule.cpp index 0db3407b7b..8461bf7130 100644 --- a/src/corelib/mimetypes/qmimemagicrule.cpp +++ b/src/corelib/mimetypes/qmimemagicrule.cpp @@ -48,7 +48,6 @@ #include <QtCore/QList> #include <QtCore/QDebug> #include <qendian.h> -#include <private/qsimd_p.h> // for qUnalignedLoad QT_BEGIN_NAMESPACE @@ -164,7 +163,7 @@ bool QMimeMagicRule::matchNumber(const QByteArray &data) const const char *p = data.constData() + m_startPos; const char *e = data.constData() + qMin(data.size() - int(sizeof(T)), m_endPos + 1); for ( ; p <= e; ++p) { - if ((qUnalignedLoad<T>(p) & mask) == (value & mask)) + if ((qFromUnaligned<T>(reinterpret_cast<const uchar *>(p)) & mask) == (value & mask)) return true; } |