diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-12 17:56:45 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-12 17:56:45 (GMT) |
| commit | 22796b38c3a7dbcdb540e4c58e645b0267fe360c (patch) | |
| tree | dab9604e944d0184249ac2dceca7b6b16adba39e /src/gui/kernel | |
| parent | b958102dfa36a3554911adb8fdb21375f0ecb48c (diff) | |
| parent | bf71ab63e805e49e59fbe25265104a414ab7d039 (diff) | |
| download | Qt-22796b38c3a7dbcdb540e4c58e645b0267fe360c.zip Qt-22796b38c3a7dbcdb540e4c58e645b0267fe360c.tar.gz Qt-22796b38c3a7dbcdb540e4c58e645b0267fe360c.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 27f2644..aee4324 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -930,7 +930,7 @@ void QSymbianControl::PositionChanged() void QSymbianControl::FocusChanged(TDrawNow /* aDrawNow */) { - if (m_ignoreFocusChanged) + if (m_ignoreFocusChanged || (qwidget->windowType() & Qt::WindowType_Mask) == Qt::Desktop) return; // Popups never get focused, but still receive the FocusChanged when they are hidden. diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index 0e98f39..b09ab8f 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -211,7 +211,8 @@ bool QSoftKeyManager::event(QEvent *e) void QSoftKeyManagerPrivate::updateSoftKeys_sys(const QList<QAction*> &softkeys) { // lets not update softkeys if s60 native dialog or menu is shown - if (CCoeEnv::Static()->AppUi()->IsDisplayingMenuOrDialog()) + if (QApplication::testAttribute(Qt::AA_S60DontConstructApplicationPanes) + || CCoeEnv::Static()->AppUi()->IsDisplayingMenuOrDialog()) return; CEikButtonGroupContainer* nativeContainer = S60->buttonGroupContainer(); |