From 008343a05e16081e2ed2b7f5166c6d5381a427ca Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 2 Oct 2020 13:19:48 +0200
Subject: qmake: Fix qHash-related integer conversion warnings

Use size_t instead of uint.

Change-Id: I1dc38f61653f9bfc4ddeddcc65b0271aa4ad1256
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 qmake/library/proitems.cpp    | 10 +++++-----
 qmake/library/proitems.h      |  8 ++++----
 qmake/library/qmakeparser.cpp |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'qmake/library')

diff --git a/qmake/library/proitems.cpp b/qmake/library/proitems.cpp
index c31b3e764f..e1cfbad8a1 100644
--- a/qmake/library/proitems.cpp
+++ b/qmake/library/proitems.cpp
@@ -36,9 +36,9 @@
 QT_BEGIN_NAMESPACE
 
 // from qhash.cpp
-uint ProString::hash(const QChar *p, int n)
+size_t ProString::hash(const QChar *p, int n)
 {
-    uint h = 0;
+    size_t h = 0;
 
     while (n--) {
         h = (h << 4) + (*p++).unicode();
@@ -80,13 +80,13 @@ ProString::ProString(QStringView str) :
 }
 
 ProString::ProString(const char *str, DoPreHashing) :
-    m_string(QString::fromLatin1(str)), m_offset(0), m_length(qstrlen(str)), m_file(0)
+    m_string(QString::fromLatin1(str)), m_offset(0), m_length(int(qstrlen(str))), m_file(0)
 {
     updatedHash();
 }
 
 ProString::ProString(const char *str) :
-    m_string(QString::fromLatin1(str)), m_offset(0), m_length(qstrlen(str)), m_file(0), m_hash(0x80000000)
+    m_string(QString::fromLatin1(str)), m_offset(0), m_length(int(qstrlen(str))), m_file(0), m_hash(0x80000000)
 {
 }
 
@@ -111,7 +111,7 @@ void ProString::setValue(const QString &str)
     m_string = str, m_offset = 0, m_length = str.length(), m_hash = 0x80000000;
 }
 
-uint ProString::updatedHash() const
+size_t ProString::updatedHash() const
 {
      return (m_hash = hash(m_string.constData() + m_offset, m_length));
 }
diff --git a/qmake/library/proitems.h b/qmake/library/proitems.h
index e875e839ff..590b976937 100644
--- a/qmake/library/proitems.h
+++ b/qmake/library/proitems.h
@@ -155,8 +155,8 @@ public:
     int toInt(bool *ok = nullptr, int base = 10) const { return toQStringView().toInt(ok, base); }
     short toShort(bool *ok = nullptr, int base = 10) const { return toQStringView().toShort(ok, base); }
 
-    uint hash() const { return m_hash; }
-    static uint hash(const QChar *p, int n);
+    size_t hash() const { return m_hash; }
+    static size_t hash(const QChar *p, int n);
 
     ALWAYS_INLINE QStringView toQStringView() const { return QStringView(m_string).mid(m_offset, m_length); }
 
@@ -184,8 +184,8 @@ private:
     QString m_string;
     int m_offset, m_length;
     int m_file;
-    mutable uint m_hash;
-    uint updatedHash() const;
+    mutable size_t m_hash;
+    size_t updatedHash() const;
     friend size_t qHash(const ProString &str);
     friend QString operator+(const ProString &one, const ProString &two);
     friend class ProKey;
diff --git a/qmake/library/qmakeparser.cpp b/qmake/library/qmakeparser.cpp
index 684879d195..52e4187dbb 100644
--- a/qmake/library/qmakeparser.cpp
+++ b/qmake/library/qmakeparser.cpp
@@ -291,7 +291,7 @@ void QMakeParser::putBlock(ushort *&tokPtr, const ushort *buf, uint len)
 
 void QMakeParser::putHashStr(ushort *&pTokPtr, const ushort *buf, uint len)
 {
-    uint hash = ProString::hash((const QChar *)buf, len);
+    const size_t hash = ProString::hash((const QChar *)buf, len);
     ushort *tokPtr = pTokPtr;
     *tokPtr++ = (ushort)hash;
     *tokPtr++ = (ushort)(hash >> 16);
@@ -305,7 +305,7 @@ void QMakeParser::finalizeHashStr(ushort *buf, uint len)
 {
     buf[-4] = TokHashLiteral;
     buf[-1] = len;
-    uint hash = ProString::hash((const QChar *)buf, len);
+    const size_t hash = ProString::hash((const QChar *)buf, len);
     buf[-3] = (ushort)hash;
     buf[-2] = (ushort)(hash >> 16);
 }
@@ -581,7 +581,7 @@ void QMakeParser::read(ProFile *pro, QStringView in, int line, SubGrammar gramma
                                                 &buf, &xprBuff, &tokPtr, &tokBuff, cur, in)) {
                             if (rtok == TokVariable || rtok == TokProperty) {
                                 xprPtr[-4] = tok;
-                                uint hash = ProString::hash((const QChar *)xprPtr, tlen);
+                                const size_t hash = ProString::hash((const QChar *)xprPtr, tlen);
                                 xprPtr[-3] = (ushort)hash;
                                 xprPtr[-2] = (ushort)(hash >> 16);
                                 xprPtr[-1] = tlen;
-- 
cgit v1.2.3