From 21d8da6365281426c50d6d5b8393d833e16d4096 Mon Sep 17 00:00:00 2001
From: Markku Luukkainen <markku.luukkainen@digia.com>
Date: Tue, 12 May 2009 16:17:35 +0200
Subject: Added handling of softkey with the role of menu

---
 src/gui/softkeys/qsoftkeystack.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gui/softkeys/qsoftkeystack.cpp b/src/gui/softkeys/qsoftkeystack.cpp
index bd9a636..c1d6e98 100644
--- a/src/gui/softkeys/qsoftkeystack.cpp
+++ b/src/gui/softkeys/qsoftkeystack.cpp
@@ -64,12 +64,18 @@ void QSoftKeyStackPrivate::setNativeSoftKeys()
 
     QSoftkeySet top = softKeyStack.top();
     mapSoftKeys(top);
+
     for (int index=0;index<top.count();index++)
     {
         QSoftKeyAction* softKeyAction = top.at(index);
         HBufC* text = qt_QString2HBufCNewL(softKeyAction->text());
         CleanupStack::PushL(text);
-        nativeContainer->SetCommandL(softKeyAction->nativePosition(), SOFTKEYSTART+softKeyAction->qtContextKey(), *text);
+        if (softKeyAction->role() == QSoftKeyAction::Menu) {
+            nativeContainer->SetCommandL(softKeyAction->nativePosition(), EAknSoftkeyOptions, *text);
+            }
+        else {
+            nativeContainer->SetCommandL(softKeyAction->nativePosition(), SOFTKEYSTART+softKeyAction->qtContextKey(), *text);
+        }
         CleanupStack::PopAndDestroy();
     }
 }
-- 
cgit v0.12