Cocoa: fix backingstore flush for 10.8
authorTeemu Katajisto <teemu.katajisto@digia.com>
Wed, 7 Nov 2012 10:23:46 +0000 (12:23 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 7 Nov 2012 11:19:14 +0000 (12:19 +0100)
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>
src/plugins/platforms/cocoa/qcocoabackingstore.mm

index eb0eb77..ef67275 100644 (file)
@@ -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];
    }
 }