From 3cd818783435ceb1314aba9a94f575ab52bd3d0f Mon Sep 17 00:00:00 2001
From: Alessandro Portale <aportale@trolltech.com>
Date: Wed, 13 May 2009 19:28:56 +0200
Subject: If the command is in a magic range pass it along to a currently
 active QMainWindow's softKeyStack.

---
 src/gui/kernel/qapplication_s60.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 72c2855..c0b4dc5 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -28,6 +28,9 @@
 #include "private/qwindowsurface_s60_p.h"
 #include "qpaintengine.h"
 #include "qmenubar.h"
+#include "qmainwindow.h"
+#include "qsoftkeystack.h"
+#include "private/qsoftkeystack_p.h"
 
 #include "apgwgnam.h" // For CApaWindowGroupName
 #include <MdaAudioTonePlayer.h>     // For CMdaAudioToneUtility
@@ -1019,8 +1022,14 @@ void QApplication::s60HandleCommandL(int command)
         qApp->exit();
         break;
     default:
-        // For now assume all unknown menu items are Qt menu items
-        QMenuBar::symbianCommands(command);
+        if (command >= SOFTKEYSTART && command <= SOFTKEYEND) {
+            const QMainWindow *activeMainWindow =
+                qobject_cast<const QMainWindow*>(QApplication::activeWindow());
+            if (activeMainWindow)
+                activeMainWindow->softKeyStack()->handleSoftKeyPress(command);
+        } else {
+            QMenuBar::symbianCommands(command);
+        }
         break;
     }
 }
-- 
cgit v0.12