Use qsizetype for size related methods in QVarlengthArray

Change-Id: Ib94b9a4e6e17da21f592e71a36fd1b97d42dfe62
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

3 files changed, 3 insertions, 4 deletions

diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 49f4d7be2e..fc93ffa19f 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -1929,8 +1929,7 @@ bool QPainter::end()
     }
 
     if (d->states.size() > 1) {
-        qWarning("QPainter::end: Painter ended with %d saved states",
-                 d->states.size());
+        qWarning("QPainter::end: Painter ended with %d saved states", int(d->states.size()));
     }
 
     if (d->engine->autoDestruct()) {
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index 6409ab9528..387c23cad8 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -3561,7 +3561,7 @@ static void PtsToRegion(int numFullPtBlocks, int iCurPtBlock,
     int extendTo = 0;
     bool needsExtend = false;
     QVarLengthArray<QRegionSpan> row;
-    int rowSize = 0;
+    qsizetype rowSize = 0;
 
     reg->extents.setLeft(INT_MAX);
     reg->extents.setRight(INT_MIN);
diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp
index 83c1e8eaa2..868ce62da2 100644
--- a/src/gui/rhi/qrhi.cpp
+++ b/src/gui/rhi/qrhi.cpp
@@ -1252,7 +1252,7 @@ uint qHash(const QRhiVertexInputLayout &v, uint seed) Q_DECL_NOTHROW
 }
 
 #ifndef QT_NO_DEBUG_STREAM
-template<typename T, int N>
+template<typename T, qsizetype N>
 QDebug operator<<(QDebug dbg, const QVarLengthArray<T, N> &vla)
 {
     return QtPrivate::printSequentialContainer(dbg, "VLA", vla);