diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-17 09:40:52 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-17 09:40:52 (GMT) |
| commit | dd678f7564955112b348a2fec56b29a8875e585e (patch) | |
| tree | d2415d20cb5a27c312150cd6ee93bce8d5129895 /src/gui/kernel/qcocoaview_mac.mm | |
| parent | 7d6af0213ab4f8797f98d0beb659fcf2f78a361b (diff) | |
| parent | bc01bb10da23d0d2308cf02a16947be836bc9a21 (diff) | |
| download | Qt-dd678f7564955112b348a2fec56b29a8875e585e.zip Qt-dd678f7564955112b348a2fec56b29a8875e585e.tar.gz Qt-dd678f7564955112b348a2fec56b29a8875e585e.tar.bz2 | |
Merge remote branch 'staging/4.6' into 4.6
Diffstat (limited to 'src/gui/kernel/qcocoaview_mac.mm')
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index ddd8ca6..6c06746 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -777,7 +777,7 @@ extern "C" { NSPoint windowPoint = [theEvent locationInWindow]; NSPoint globalPoint = [[theEvent window] convertBaseToScreen:windowPoint]; NSPoint localPoint = [self convertPoint:windowPoint fromView:nil]; - QPoint qlocal = QPoint(localPoint.x, flipYCoordinate(localPoint.y)); + QPoint qlocal = QPoint(localPoint.x, localPoint.y); QPoint qglobal = QPoint(globalPoint.x, flipYCoordinate(globalPoint.y)); Qt::MouseButtons buttons = QApplication::mouseButtons(); bool wheelOK = false; |