Cocoa: QImage -> CGImage conversion cleanup

Move to one qt_mac_toCGImage function that has simple
semantics and properly retains a copy of the QImage
for the lifetime of the CGImage.

Remove the old qt_mac_toCGImage function which had
two problems:

1) It would not retain the QImage data (this was probably
ok for its original use case: creating short-lived
CGImages for the paint engine)

2) It had acquired a somewhat odd **datacopy out
parameter for the cases where you _do_ want to retain
the image data.

This makes the exported image conversion function
from QtMacExtras work: The CGImages it creates will
no longer reference free'd memory once the QImage
is deleted.

Change-Id: I583040d16aefb17fc3d801d6b047a0b2a76c7f74
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
index 30c15d823a..3ca611b537 100644
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
@@ -122,7 +122,7 @@ bool QCocoaBackingStore::scroll(const QRegion &area, int dx, int dy)
 CGImageRef QCocoaBackingStore::getBackingStoreCGImage()
 {
     if (!m_cgImage)
-        m_cgImage = qt_mac_toCGImage(m_qImage, false, 0);
+        m_cgImage = qt_mac_toCGImage(m_qImage);
 
     // Warning: do not retain/release/cache the returned image from
     // outside the backingstore since it shares data with a QImage and