From 90e4bc5fdf1d0177e6acbb70349d85ca303c8e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Tue, 8 Jan 2013 14:30:54 +0100 Subject: Compile in 32-bit mode. CGRect == NSRect only in 64-bit mode. Change-Id: I069b5b050ccf02654a65375c3ab0f58f7d5cc659 Reviewed-by: Gabriel de Dietrich --- src/widgets/styles/qmacstyle_mac.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index 5994457eb1..9834d830ca 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -3101,7 +3101,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai CGContextScaleCTM(cg, 1, -1); CGContextTranslateCTM(cg, -rect.origin.x, -rect.origin.y); - [triangleCell drawBezelWithFrame:rect inView:[triangleCell controlView]]; + [triangleCell drawBezelWithFrame:NSRectFromCGRect(rect) inView:[triangleCell controlView]]; [NSGraphicsContext restoreGraphicsState]; CGContextRestoreGState(cg); @@ -5028,7 +5028,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex // Draw the track when hovering if (opt->activeSubControls || wasActive) { - CGRect rect = [scroller bounds]; + NSRect rect = [scroller bounds]; if (shouldExpand) { if (isHorizontal) rect.origin.y += 4.5 - expandOffset; -- cgit v1.2.3