1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNX: Fix build error

Browse Source 
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>
This commit is contained in:
Rafael Roquetto 2013-03-07 11:38:36 -03:00 committed by The Qt Project
parent 4d2bf663eb
commit ef7c25e848
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/qnx/qqnxscreen.cpp
View File

@ -503,11 +503,6 @@ QPlatformCursor * QQnxScreen::cursor() const
return m_cursor; return m_cursor;
} }
QPlatformCursor * QQnxScreen::cursor() const
{
return m_cursor;
}
void QQnxScreen::keyboardHeightChanged(int height) void QQnxScreen::keyboardHeightChanged(int height)
{ {
if (height == m_keyboardHeight) if (height == m_keyboardHeight)