From ef7c25e8486a092ead3c02e0346cc0d765d6a22f Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Thu, 7 Mar 2013 11:38:36 -0300 Subject: QNX: Fix build error This error was caused by a merge Change-Id: I937ab6ac905ba3a729669060285df6d0c3d5be2f Reviewed-by: Thomas McGuire Reviewed-by: Tobias Koenig Reviewed-by: Wolfgang Bremer --- src/plugins/platforms/qnx/qqnxscreen.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/plugins/platforms/qnx/qqnxscreen.cpp') 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) -- cgit v1.2.3