diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-12-16 16:59:27 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-12-16 16:59:27 (GMT) |
| commit | f763f0089e0acb114524a6276c2ed7ff823d1d05 (patch) | |
| tree | e1d825f0a5f5429b27d153861f91b33dc4e4a6fc /src/gui/kernel | |
| parent | 2a2dec6666f8f38e9240784b423ce69b18e1064e (diff) | |
| parent | cbe70d58bc1667b2e09f78a5d4427e7d071a2354 (diff) | |
| download | Qt-f763f0089e0acb114524a6276c2ed7ff823d1d05.zip Qt-f763f0089e0acb114524a6276c2ed7ff823d1d05.tar.gz Qt-f763f0089e0acb114524a6276c2ed7ff823d1d05.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 4 |
2 files changed, 4 insertions, 2 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; diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 3579c79..eedf0a7 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -3023,7 +3023,7 @@ QShowEvent::~QShowEvent() This event is only used to notify the application of a request. It may be safely ignored. - \note This class is currently supported for Mac Os X only. + \note This class is currently supported for Mac OS X only. */ /*! @@ -3066,6 +3066,8 @@ QFileOpenEvent::~QFileOpenEvent() \fn QUrl QFileOpenEvent::url() const Returns the url that is being opened. + + \since 4.6 */ QUrl QFileOpenEvent::url() const { |