diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 11:47:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 11:47:06 (GMT) |
| commit | e6d2e23a0694146e4050560f2fb8100f40188597 (patch) | |
| tree | 34336c7248d865363216f8b0d97706e1892c099c | |
| parent | 35b5f15c3fe5c2f1f0d046d09b9d95dee3bb91b5 (diff) | |
| parent | d4b722868bbd2b228a877e15e5ca44dd9ad8d94c (diff) | |
| download | Qt-e6d2e23a0694146e4050560f2fb8100f40188597.zip Qt-e6d2e23a0694146e4050560f2fb8100f40188597.tar.gz Qt-e6d2e23a0694146e4050560f2fb8100f40188597.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix rendering of Mac controls onto a QImage
| -rw-r--r-- | src/gui/painting/qpaintengine_mac.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/painting/qpaintengine_mac.cpp index cc75b86..5fcf89d 100644 --- a/src/gui/painting/qpaintengine_mac.cpp +++ b/src/gui/painting/qpaintengine_mac.cpp @@ -100,7 +100,7 @@ QMacCGContext::QMacCGContext(QPainter *p) int devType = p->device()->devType(); if (pe->type() == QPaintEngine::Raster - && (devType == QInternal::Widget || devType == QInternal::Pixmap)) { + && (devType == QInternal::Widget || devType == QInternal::Pixmap || devType == QInternal::Image)) { extern CGColorSpaceRef qt_mac_colorSpaceForDeviceType(const QPaintDevice *paintDevice); CGColorSpaceRef colorspace = qt_mac_colorSpaceForDeviceType(pe->paintDevice()); |