diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-12-09 13:40:47 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-09 14:15:37 +0100 |
| commit | b986131c6d1243725134285dfc94581f80c00746 (patch) | |
| tree | a1b2de270ca9324d57ab0394e52b90190149eaf7 /src/plugins | |
| parent | d8374aebc6f1c4fdeae2028ceba0f2c52ef32ec4 (diff) | |
Correctly reimplement QPlatformCursor::pos() in QCocoaCursor
QPlatformCursor::pos() is a const function, the reimplementation should
be as well.
Change-Id: I7e37e41086e3b329dc31ebc060fcb0915771d884
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoacursor.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoacursor.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoacursor.h b/src/plugins/platforms/cocoa/qcocoacursor.h index bb48da7ecb..dd66185f70 100644 --- a/src/plugins/platforms/cocoa/qcocoacursor.h +++ b/src/plugins/platforms/cocoa/qcocoacursor.h @@ -55,7 +55,7 @@ public: explicit QCocoaCursor(QPlatformScreen *); virtual void changeCursor(QCursor * widgetCursor, QWindow * widget); - virtual QPoint pos(); + virtual QPoint pos() const; virtual void setPos(const QPoint &position); private: QHash<Qt::CursorShape, NSCursor *> m_cursors; diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm index 70e3fb8c63..67386c78e1 100644 --- a/src/plugins/platforms/cocoa/qcocoacursor.mm +++ b/src/plugins/platforms/cocoa/qcocoacursor.mm @@ -113,7 +113,7 @@ void QCocoaCursor::changeCursor(QCursor *cursor, QWindow *window) } } -QPoint QCocoaCursor::pos() +QPoint QCocoaCursor::pos() const { return qt_mac_flipPoint([NSEvent mouseLocation]).toPoint(); } |