diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-17 10:53:42 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-17 10:53:42 +0200 |
commit | 3cb56800d581dabd18e354a24f018c55bd91f748 (patch) | |
tree | 9b8e95cf62e22026463a0f87a3625b279f457aad /src/corelib/mimetypes/qmimemagicrule.cpp | |
parent | aed7540d45096791d1a824f500694a15426fd94b (diff) | |
parent | 3d8c8daae109fbd6d60e43c3d4457b581e5e62a3 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
Change-Id: If899cda251b4dc8b8a7c6764520e88ab719737cd
Diffstat (limited to 'src/corelib/mimetypes/qmimemagicrule.cpp')
-rw-r--r-- | src/corelib/mimetypes/qmimemagicrule.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/mimetypes/qmimemagicrule.cpp b/src/corelib/mimetypes/qmimemagicrule.cpp index 8461bf7130..7e07f8acb9 100644 --- a/src/corelib/mimetypes/qmimemagicrule.cpp +++ b/src/corelib/mimetypes/qmimemagicrule.cpp @@ -163,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 ((qFromUnaligned<T>(reinterpret_cast<const uchar *>(p)) & mask) == (value & mask)) + if ((qFromUnaligned<T>(p) & mask) == (value & mask)) return true; } |