From 62abbe34b84a1c224d27f3eb2f735749f5f24b4f Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Tue, 5 Jun 2018 13:13:12 +0200
Subject: 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>
---
 src/corelib/mimetypes/qmimemagicrule.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'src/corelib/mimetypes')

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;
-- 
cgit v1.2.3