AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cocoa: Remove qt_mac_toCGImage warnings

Browse Source 
We got these because we were flushing the backing store with a
null QImage.

Change-Id: I372cb3fc7c82d3bdcfe735fcadfa72806d0ef39b
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
Gabriel de Dietrich 2013-02-26 15:31:23 +01:00 committed by The Qt Project
parent e433553c1b
commit 48d39a01a7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoabackingstore.mm
View File

@ -90,9 +90,11 @@ void QCocoaBackingStore::flush(QWindow *win, const QRegion &region, const QPoint
// m_cgImage is only a reference to the data inside m_qImage, it is not a copy. // m_cgImage is only a reference to the data inside m_qImage, it is not a copy.
CGImageRelease(m_cgImage); CGImageRelease(m_cgImage);
m_cgImage = 0; m_cgImage = 0;
if (!m_qImage.isNull()) {
if (QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(win->handle())) if (QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(win->handle()))
[cocoaWindow->m_contentView flushBackingStore:this region:region offset:offset]; [cocoaWindow->m_contentView flushBackingStore:this region:region offset:offset];
} }
}
void QCocoaBackingStore::resize(const QSize &size, const QRegion &) void QCocoaBackingStore::resize(const QSize &size, const QRegion &)
{ {