diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2010-04-06 10:25:59 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2010-04-06 10:40:21 (GMT) |
| commit | f8f83e3a9177531169c3c2b525c868b6f4016381 (patch) | |
| tree | e75e9330078bfbd3f94773bcbfe4d5fc3cbd8525 /src/gui/kernel/qsoftkeymanager_common_p.h | |
| parent | c96047c0495c58b56a73873fd235ce859e0e9255 (diff) | |
| download | Qt-f8f83e3a9177531169c3c2b525c868b6f4016381.zip Qt-f8f83e3a9177531169c3c2b525c868b6f4016381.tar.gz Qt-f8f83e3a9177531169c3c2b525c868b6f4016381.tar.bz2 | |
Fixed modal dialog not to have automatic "Exit" right softkey in S60.
During softkey refactoring this piece of code get changes, but the
changed code did not work correctly if window had no softkey actions.
Switched back to old way where softkey source is stored to variable,
and windowType is asked from stored variable. If softkey source is
dialog or popup, "Exit" is not added automatically to RSK.
Task-number: QT-2203
Reviewed-by: Sami Merila
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager_common_p.h')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager_common_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qsoftkeymanager_common_p.h b/src/gui/kernel/qsoftkeymanager_common_p.h index 460d0dc..04ddf7d 100644 --- a/src/gui/kernel/qsoftkeymanager_common_p.h +++ b/src/gui/kernel/qsoftkeymanager_common_p.h @@ -70,6 +70,7 @@ protected: static QSoftKeyManager *self; QHash<QAction*, Qt::Key> keyedActions; QMultiHash<int, QAction*> requestedSoftKeyActions; + QWidget *initialSoftKeySource; }; @@ -79,4 +80,4 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QSOFTKEYMANAGER_COMMON_P_H
\ No newline at end of file +#endif // QSOFTKEYMANAGER_COMMON_P_H |