Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-rc1v5.5.0

Conflicts:
	.qmake.conf

Change-Id: I769ed6443b24c3329f614807d91bcfdde93939f9

1 files changed, 5 insertions, 1 deletions

diff --git a/src/macextras/qmacfunctions_mac.mm b/src/macextras/qmacfunctions_mac.mm
index b14c9b7..99515c1 100644
--- a/src/macextras/qmacfunctions_mac.mm
+++ b/src/macextras/qmacfunctions_mac.mm
@@ -59,10 +59,14 @@ namespace QtMac
 */
 NSImage* toNSImage(const QPixmap &pixmap)
 {
-    NSBitmapImageRep *bitmapRep = [[NSBitmapImageRep alloc] initWithCGImage:toCGImageRef(pixmap)];
+    if (pixmap.isNull())
+        return 0;
+    CGImageRef cgimage = toCGImageRef(pixmap);
+    NSBitmapImageRep *bitmapRep = [[NSBitmapImageRep alloc] initWithCGImage:cgimage];
     NSImage *image = [[NSImage alloc] init];
     [image addRepresentation:bitmapRep];
     [bitmapRep release];
+    CFRelease(cgimage);
     return image;
 }