Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (189 commits)
  Fixed compile error in qwindowsurface_qws.cpp.
  Fixed regression introduced by 5842d19cf3dff37a85c.
  Remove DerivedSources.pro from WebKit.
  Support debuggable in the makefile build system
  QLabel documentation: add warning about sanitizing input
  Mark all Symbian debug binaries debuggable by default
  Detect linked fonts by name (insead of via CLinkedTypeface* Api)
  Revert "fix QFileInfo::isSymLink() for NTFS mount points"
  Fix typo for ifdef QT_NO_ACCESSIBILITY
  Call QAccessible::updateAccessibility when a widget is deleted
  Fix gamma corrected source color in GL
  Make macdeployqt more robust against usage of symbolic links.
  Revert binary search in QTextEngine::findItem
  Remove a duplicate include line
  Document support for Linguist on Mac.
  Save previous font engine for right bearing adjustment
  Symbian^3 workaround: Avoid usage of linked fonts.
  Make it possible to update a related table after an external update
  Make mac(deploy|change)qt handle dylibs that use Qt inside an app bundle.
  Guard macdeployqt against @rpath and @loader_path too.
  ...

1 files changed, 2 insertions, 0 deletions

diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h
index 2607c2a..1d624f9 100644
--- a/src/gui/kernel/qkeymapper_p.h
+++ b/src/gui/kernel/qkeymapper_p.h
@@ -213,6 +213,8 @@ public:
     int mapS60ScanCodesToQt(TUint s60key);
     int mapQtToS60Key(int qtKey);
     int mapQtToS60ScanCodes(int qtKey);
+    int mapS60RemConIdToS60Key(int s60RemConId);
+    int mapS60RemConIdToS60ScanCodes(int s60RemConId);
     void updateInputLanguage();
 #endif
 };