diff options
author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2013-03-07 11:38:36 -0300 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-12 18:13:37 +0100 |
commit | ef7c25e8486a092ead3c02e0346cc0d765d6a22f (patch) | |
tree | 5b5e4de707bcbf1a841d777b51851ea34cb7c202 /src | |
parent | 4d2bf663ebca19402fda5527535b93d5cdde6e27 (diff) |
QNX: Fix build error
This error was caused by a merge
Change-Id: I937ab6ac905ba3a729669060285df6d0c3d5be2f
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Tobias Koenig
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/platforms/qnx/qqnxscreen.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/plugins/platforms/qnx/qqnxscreen.cpp b/src/plugins/platforms/qnx/qqnxscreen.cpp index 3e79ca7f1d..f9efbde40c 100644 --- a/src/plugins/platforms/qnx/qqnxscreen.cpp +++ b/src/plugins/platforms/qnx/qqnxscreen.cpp @@ -503,11 +503,6 @@ QPlatformCursor * QQnxScreen::cursor() const return m_cursor; } -QPlatformCursor * QQnxScreen::cursor() const -{ - return m_cursor; -} - void QQnxScreen::keyboardHeightChanged(int height) { if (height == m_keyboardHeight) |