From 9423be1f190bd7cdeb04add39f4ec621a33a3041 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 11 Jul 2017 10:54:18 +0200
Subject: Fix deprecation warnings

Switch to QImage::sizeInBytes for huge QImage support.

Change-Id: I0145f204dd2db6670e199c320fff9064b4a97ef4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 src/gui/image/qimage.h         | 2 +-
 src/gui/image/qimage_darwin.mm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 7ad44cc33e..eccff480bb 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -471,7 +471,7 @@ inline void QImage::setNumColors(int n)
 
 inline int QImage::numBytes() const
 {
-    return byteCount();
+    return int(sizeInBytes());
 }
 #endif
 
diff --git a/src/gui/image/qimage_darwin.mm b/src/gui/image/qimage_darwin.mm
index 3764bef06b..a5c391ad21 100644
--- a/src/gui/image/qimage_darwin.mm
+++ b/src/gui/image/qimage_darwin.mm
@@ -130,7 +130,7 @@ CGImageRef QImage::toCGImage() const
     auto deleter = [](void *image, const void *, size_t)
                    { delete static_cast<QImage *>(image); };
     QCFType<CGDataProviderRef> dataProvider =
-        CGDataProviderCreateWithData(new QImage(*this), bits(), byteCount(), deleter);
+        CGDataProviderCreateWithData(new QImage(*this), bits(), sizeInBytes(), deleter);
 
     QCFType<CGColorSpaceRef> colorSpace =  CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
 
-- 
cgit v1.2.3