1 files changed, 7 insertions, 4 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 2f7bdcf..542ad43 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -59,6 +59,7 @@
 #include "private/qwindowsurface_s60_p.h"
 #include "qpaintengine.h"
 #include "private/qmenubar_p.h"
+#include "private/qsoftkeystack_p.h"
 
 #include "apgwgnam.h" // For CApaWindowGroupName
 #include <MdaAudioTonePlayer.h>     // For CMdaAudioToneUtility
@@ -1059,13 +1060,14 @@ void QApplication::symbianHandleCommand(int command)
 {
     switch (command) {
     case EEikCmdExit:
-    case EAknSoftkeyBack:
     case EAknSoftkeyExit:
-        qApp->exit();
+        exit();
         break;
     default:
-        // For now assume all unknown menu items are Qt menu items
-        QMenuBarPrivate::symbianCommands(command);
+        if (command >= SOFTKEYSTART && command <= SOFTKEYEND)
+            QSoftKeyStackPrivate::handleSoftKeyPress(command);
+        else
+            QMenuBarPrivate::symbianCommands(command);
         break;
     }
 }
@@ -1100,6 +1102,7 @@ void QApplication::symbianResourceChange(int type)
 #endif
         
     default:
+>>>>>>> master:src/gui/kernel/qapplication_s60.cpp
         break;
     }
 }