From 1966b88611bb45d18d586847eeb3597d6e022eb7 Mon Sep 17 00:00:00 2001 From: Fabien Freling Date: Fri, 8 Oct 2010 18:37:25 +0200 Subject: Experimental support of the unified toolbar with the raster engine on Mac OS X. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-12615 Reviewed-by: Samuel Rødal --- src/gui/image/qnativeimage.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/gui/image/qnativeimage.cpp') diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp index 844638789d..5978a1ba6b 100644 --- a/src/gui/image/qnativeimage.cpp +++ b/src/gui/image/qnativeimage.cpp @@ -241,8 +241,19 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format, bool /* : image(width, height, format) { - uint cgflags = kCGImageAlphaNoneSkipFirst; + switch (format) { + case QImage::Format_ARGB32: + cgflags = kCGImageAlphaFirst; + break; + case QImage::Format_ARGB32_Premultiplied: + case QImage::Format_ARGB8565_Premultiplied: + case QImage::Format_ARGB6666_Premultiplied: + case QImage::Format_ARGB8555_Premultiplied: + case QImage::Format_ARGB4444_Premultiplied: + cgflags = kCGImageAlphaPremultipliedFirst; + break; + } #ifdef kCGBitmapByteOrder32Host //only needed because CGImage.h added symbols in the minor version cgflags |= kCGBitmapByteOrder32Host; -- cgit v1.2.3