diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-12-02 15:08:53 +0200 |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-12-02 15:08:53 +0200 |
| commit | 855d2702ffff37452ff3bc0e1576d1d17fdb76c2 (patch) | |
| tree | 16cfc4e38166a843003aaaaa5cd088bf75fb04a6 /src/gui/kernel/qsoftkeymanager.cpp | |
| parent | 7c70e69511817127aa4691339af4a6aa07c1502a (diff) | |
Fixed softkey merging/traversing over window boundaries.
If current dialog implementation had parent and no softkeys set,
the dialog got softkeys from parent. This commit changes the behaviour
so that softkeys are not traversed over window boundaries.
Also added autotest for the bug report.
Task-number: QTBUG-6163
Reviewed-by: Jason Barron
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager.cpp')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index 775d773df5..1acc9b376e 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -190,7 +190,7 @@ bool QSoftKeyManager::event(QEvent *e) } QWidget *parent = source->parentWidget(); - if (parent && softKeys.isEmpty()) + if (parent && softKeys.isEmpty() && !source->isWindow()) source = parent; else break; |