diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-06-25 07:33:13 (GMT) |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-06-25 07:33:13 (GMT) |
| commit | 5b52c348243e6459cc7faa4ee76a23c7fadcd299 (patch) | |
| tree | be4bee855e535651b5fa22e9554ce1732f6ece70 /src/gui/image/qnativeimage.cpp | |
| parent | 2020c692803a8a7839d85860d05174a193d9a848 (diff) | |
| parent | 0362832c16f95c2909e2a68351e15242b7d1b795 (diff) | |
| download | Qt-5b52c348243e6459cc7faa4ee76a23c7fadcd299.zip Qt-5b52c348243e6459cc7faa4ee76a23c7fadcd299.tar.gz Qt-5b52c348243e6459cc7faa4ee76a23c7fadcd299.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/image/qnativeimage.cpp')
| -rw-r--r-- | src/gui/image/qnativeimage.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp index bb8f98a..e3fb27a 100644 --- a/src/gui/image/qnativeimage.cpp +++ b/src/gui/image/qnativeimage.cpp @@ -52,6 +52,10 @@ #include <qwidget.h> #endif +#ifdef Q_WS_MAC +#include <private/qpaintengine_mac_p.h> +#endif + QT_BEGIN_NAMESPACE #ifdef Q_WS_WIN @@ -225,15 +229,14 @@ QImage::Format QNativeImage::systemFormat() #elif defined(Q_WS_MAC) -QNativeImage::QNativeImage(int width, int height, QImage::Format format, bool /* isTextBuffer */, QWidget *) +QNativeImage::QNativeImage(int width, int height, QImage::Format format, bool /* isTextBuffer */, QWidget *widget) : image(width, height, format) { - cgColorSpace = CGColorSpaceCreateDeviceRGB(); + cgColorSpace = QCoreGraphicsPaintEngine::macDisplayColorSpace(widget); uint cgflags = kCGImageAlphaNoneSkipFirst; #ifdef kCGBitmapByteOrder32Host //only needed because CGImage.h added symbols in the minor version - if(QSysInfo::MacintoshVersion >= QSysInfo::MV_10_4) - cgflags |= kCGBitmapByteOrder32Host; + cgflags |= kCGBitmapByteOrder32Host; #endif cg = CGBitmapContextCreate(image.bits(), width, height, 8, image.bytesPerLine(), cgColorSpace, cgflags); |