diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-05 13:13:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-06 11:36:33 +0000 |
| commit | 62abbe34b84a1c224d27f3eb2f735749f5f24b4f (patch) | |
| tree | ec1eee6ce05a917084d6feb656d54c6849ab9215 /src/corelib/mimetypes/qmimemagicrule.cpp | |
| parent | 8c33b798237b95d37fe4d60ae36f0d8067504429 (diff) | |
Fix build for Android with android-clang in r17
Task-number: QTBUG-67464
Change-Id: Ib971a5da82b31bce9ac1c9ac623ad7d5302cfaec
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/corelib/mimetypes/qmimemagicrule.cpp')
| -rw-r--r-- | src/corelib/mimetypes/qmimemagicrule.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/corelib/mimetypes/qmimemagicrule.cpp b/src/corelib/mimetypes/qmimemagicrule.cpp index 6356a3581b..9dadebc999 100644 --- a/src/corelib/mimetypes/qmimemagicrule.cpp +++ b/src/corelib/mimetypes/qmimemagicrule.cpp @@ -315,18 +315,14 @@ QMimeMagicRule::QMimeMagicRule(const QString &type, break; case Big32: case Little32: - if (m_number <= quint32(-1)) { - m_number = m_type == Little32 ? qFromLittleEndian<quint32>(m_number) : qFromBigEndian<quint32>(m_number); - if (m_numberMask != 0) - m_numberMask = m_type == Little32 ? qFromLittleEndian<quint32>(m_numberMask) : qFromBigEndian<quint32>(m_numberMask); - } + m_number = m_type == Little32 ? qFromLittleEndian<quint32>(m_number) : qFromBigEndian<quint32>(m_number); + if (m_numberMask != 0) + m_numberMask = m_type == Little32 ? qFromLittleEndian<quint32>(m_numberMask) : qFromBigEndian<quint32>(m_numberMask); Q_FALLTHROUGH(); case Host32: - if (m_number <= quint32(-1)) { - if (m_numberMask == 0) - m_numberMask = quint32(-1); - m_matchFunction = &QMimeMagicRule::matchNumber<quint32>; - } + if (m_numberMask == 0) + m_numberMask = quint32(-1); + m_matchFunction = &QMimeMagicRule::matchNumber<quint32>; break; default: break; |