diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-10-23 12:26:23 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-10-23 12:26:23 (GMT) |
| commit | dd48c27fcdded149c8db7d08107632c2476178ca (patch) | |
| tree | f670e04e26ab3536238cfd030694aa2d601b8245 /src/gui/kernel/qsoftkeymanager.cpp | |
| parent | 180d9189e8098d98848367f673fff723ddd1d068 (diff) | |
| download | Qt-dd48c27fcdded149c8db7d08107632c2476178ca.zip Qt-dd48c27fcdded149c8db7d08107632c2476178ca.tar.gz Qt-dd48c27fcdded149c8db7d08107632c2476178ca.tar.bz2 | |
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
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager.cpp')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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<QAction*> &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 |