Merge remote-tracking branch 'origin/5.10.0' into 5.10

Change-Id: I6dcf85067ec226136c207ea69ca9d66736c84db5

1 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 097033280a..99c2271581 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -130,7 +130,7 @@ QImageData * QImageData::create(const QSize &size, QImage::Format format)
     if (std::numeric_limits<int>::max()/depth < width
         || bytes_per_line <= 0
         || height <= 0
-        || std::numeric_limits<qssize_t>::max()/uint(bytes_per_line) < height
+        || std::numeric_limits<qsizetype>::max()/uint(bytes_per_line) < height
         || std::numeric_limits<int>::max()/sizeof(uchar *) < uint(height))
         return 0;
 
@@ -1470,7 +1470,7 @@ int QImage::byteCount() const
     \sa byteCount(), bytesPerLine(), bits(), {QImage#Image Information}{Image
     Information}
 */
-qssize_t QImage::sizeInBytes() const
+qsizetype QImage::sizeInBytes() const
 {
     return d ? d->nbytes : 0;
 }