From dd48c27fcdded149c8db7d08107632c2476178ca Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Fri, 23 Oct 2009 15:26:23 +0300 Subject: Softkeys should not put exit by default on RSK for dialogs and popups. The idea is that softkeys and pop-ups need to take care of setting all softkeys by themselves. Task-number: QTBUG-4916 Reviewed-by: Jason Barron --- src/gui/kernel/qsoftkeymanager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index 6116a5e..fac936f 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -237,7 +237,8 @@ void QSoftKeyManagerPrivate::updateSoftKeys_sys(const QList &softkeys) } } - if (needsExitButton) + Qt::WindowType sourceWindowType = QSoftKeyManagerPrivate::softKeySource->window()->windowType(); + if (needsExitButton && sourceWindowType != Qt::Dialog && sourceWindowType != Qt::Popup) QT_TRAP_THROWING(nativeContainer->SetCommandL(2, EAknSoftkeyExit, qt_QString2TPtrC(QSoftKeyManager::tr("Exit")))); nativeContainer->DrawDeferred(); // 3.1 needs an extra invitation -- cgit v0.12