summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/cocoa/qnsview.mm
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2012-08-13 16:00:51 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-21 13:41:01 +0200
commita59906e0f3f620d9241e27e7f13aa620a58c6df9 (patch)
treea613a7dd5d0944309c260d5d75176e96589f74b9 /src/plugins/platforms/cocoa/qnsview.mm
parent46bef9f29ff6fa85a1ab5d943daa23d5f8015f1d (diff)
Fix a bunch of Mac/clang specific warnings
Change-Id: I0ecc67d58fb7e727a88a5f546eeca01ff7554502 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qnsview.mm')
-rw-r--r--src/plugins/platforms/cocoa/qnsview.mm5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index 3f43c1dfa2..72b948912a 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -335,7 +335,7 @@ static QTouchDevice *touchDevice = 0;
int windowHeight = [window frame].size.height;
NSPoint windowPoint = [theEvent locationInWindow];
NSPoint nsViewPoint = [self convertPoint: windowPoint fromView: nil];
- QPoint qtWindowPoint = QPoint(windowPoint.x, windowHeight - windowPoint.y);
+ QPoint qtWindowPoint = QPoint(nsViewPoint.x, windowHeight - nsViewPoint.y);
NSPoint screenPoint = [window convertBaseToScreen : windowPoint];
QPoint qtScreenPoint = QPoint(screenPoint.x, qt_mac_flipYCoordinate(screenPoint.y));
@@ -1079,6 +1079,7 @@ static QTouchDevice *touchDevice = 0;
- (void)draggedImage:(NSImage*) img endedAt:(NSPoint) point operation:(NSDragOperation) operation
{
+ Q_UNUSED(img);
QCocoaDrag* nativeDrag = static_cast<QCocoaDrag *>(QGuiApplicationPrivate::platformIntegration()->drag());
nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation));
@@ -1087,7 +1088,7 @@ static QTouchDevice *touchDevice = 0;
m_buttons &= QFlag(~int(Qt::LeftButton));
NSPoint windowPoint = [self convertPoint: point fromView: nil];
- QPoint qtWindowPoint(point.x, point.y);
+ QPoint qtWindowPoint(windowPoint.x, windowPoint.y);
NSWindow *window = [self window];
NSPoint screenPoint = [window convertBaseToScreen :point];