summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Katajisto <teemu.katajisto@digia.com>2012-11-07 12:23:46 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-07 12:19:14 +0100
commitfe7f4e9394f41125b045086f83340a637683131c (patch)
tree191e1a8e452713c1203f9ae10516555e92be946c
parentf09d4349876d147d5b2ba38dfa5010139c44cf35 (diff)
Cocoa: fix backingstore flush for 10.8
Remove compile time version check to make flushing work correctly when building with other sdks than 10.8. Task-number: QTBUG-27862 Change-Id: I915ae80017be1c03d5217aa9bdb60991603f8d01 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
-rw-r--r--src/plugins/platforms/cocoa/qcocoabackingstore.mm15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
index eb0eb77905..ef67275208 100644
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
@@ -73,15 +73,12 @@ void QCocoaBackingStore::flush(QWindow *widget, const QRegion &region, const QPo
NSRect rect = NSMakeRect(geo.x(), geo.y(), geo.width(), geo.height());
QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(window()->handle());
if (cocoaWindow) {
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
- if (QSysInfo::QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) {
- // Workaround for malfunctioning displayRect on 10.8 where
- // calling it seems to have no effect. Call setImage like
- // resize() does.
- [cocoaWindow->m_contentView setImage:m_image];
- }
-#endif
+ if (QSysInfo::QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) {
+ // Workaround for malfunctioning displayRect on 10.8 where
+ // calling it seems to have no effect. Call setImage like
+ // resize() does.
+ [cocoaWindow->m_contentView setImage:m_image];
+ }
[cocoaWindow->m_contentView displayRect:rect];
}
}