diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-12-07 04:40:54 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-12-07 04:40:54 (GMT) |
| commit | 93a2b57c7e3c2be5b1c64d3408d27acb4aa2c8fc (patch) | |
| tree | 5efe4f6c6386e25dc7d3235c7f261d3fdf5a19c3 /src/gui/kernel/qsoftkeymanager.cpp | |
| parent | 55a3fda3baf545cc7fbfa6b2c00705be40a7319b (diff) | |
| parent | 47008b211fe3b972077466e593a2a9016446bab2 (diff) | |
| download | Qt-93a2b57c7e3c2be5b1c64d3408d27acb4aa2c8fc.zip Qt-93a2b57c7e3c2be5b1c64d3408d27acb4aa2c8fc.tar.gz Qt-93a2b57c7e3c2be5b1c64d3408d27acb4aa2c8fc.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
src/tools/moc/generator.cpp
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 775d773..1acc9b3 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; |