Changeset 846 for trunk/src/gui/kernel/qkeymapper_s60.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/kernel/qkeymapper_s60.cpp (modified) (3 diffs)

trunk/src/gui/kernel/qkeymapper_s60.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -145 +145 @@
     {EKeyDevice1, EStdKeyDevice1, Key_Context2}, // Found by manual testing.
     {EKeyDevice3, EStdKeyDevice3, Key_Select},
-//    {EKeyDevice7, EStdKeyDevice7, Key_Camera},  //not supported by qt yet
+    {EKeyDevice7, EStdKeyDevice7, Key_Camera},  
     {EKeyApplication0, EStdKeyApplication0, Key_Menu}, // Found by manual testing.
     {EKeyApplication1, EStdKeyApplication1, Key_Launch1}, // Found by manual testing.
@@ -162 +162 @@
     {EKeyApplicationE, EStdKeyApplicationE, Key_LaunchE},
     {EKeyApplicationF, EStdKeyApplicationF, Key_LaunchF},
-//    {EKeyApplication19, EStdKeyApplication19, Key_CameraFocus},  //not supported by qt yet
+    {EKeyApplication19, EStdKeyApplication19, Key_CameraFocus}, 
     {EKeyYes, EStdKeyYes, Key_Yes},
     {EKeyNo, EStdKeyNo, Key_No},