summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarkku Luukkainen <markku.luukkainen@digia.com>2009-05-12 14:17:35 (GMT)
committerMarkku Luukkainen <markku.luukkainen@digia.com>2009-05-12 14:17:35 (GMT)
commit21d8da6365281426c50d6d5b8393d833e16d4096 (patch)
treec08c915f2866899e77b4cc25c07fbc6c56b3d1b2 /src
parent9ef6e374126ba212bccbf3cf61f86f8412099c49 (diff)
downloadQt-21d8da6365281426c50d6d5b8393d833e16d4096.zip
Qt-21d8da6365281426c50d6d5b8393d833e16d4096.tar.gz
Qt-21d8da6365281426c50d6d5b8393d833e16d4096.tar.bz2
Added handling of softkey with the role of menu
Diffstat (limited to 'src')
-rw-r--r--src/gui/softkeys/qsoftkeystack.cpp8
1 files changed, 7 insertions, 1 deletions
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();
}
}