diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-01 13:29:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-01 13:29:20 (GMT) |
| commit | 62b02e0ad19bcef3487467f828d05c59151550b6 (patch) | |
| tree | 59047e95965db55fcbe15391a127f2cc36518662 | |
| parent | 0b51685dc7c3c8cbbbaa1fd33ab71ba16966f657 (diff) | |
| parent | 1affc6720a338f59b824af1825936335e7ce1602 (diff) | |
| download | Qt-62b02e0ad19bcef3487467f828d05c59151550b6.zip Qt-62b02e0ad19bcef3487467f828d05c59151550b6.tar.gz Qt-62b02e0ad19bcef3487467f828d05c59151550b6.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian: Fix CBA display on application with multiple windows
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index ca9c3a3..c94d66d 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1548,6 +1548,7 @@ void QSymbianControl::FocusChanged(TDrawNow /* aDrawNow */) || (qwidget->windowType() & Qt::Popup) == Qt::Popup) return; + QWidget *parentWindow = qwidget->window(); if (IsFocused() && IsVisible()) { if (m_symbianPopupIsOpen) { QWidget *fw = QApplication::focusWidget(); @@ -1562,11 +1563,10 @@ void QSymbianControl::FocusChanged(TDrawNow /* aDrawNow */) qwidget->d_func()->setWindowIcon_sys(true); qwidget->d_func()->setWindowTitle_sys(qwidget->windowTitle()); #ifdef Q_WS_S60 - if (qwidget->isWindow()) - S60->setRecursiveDecorationsVisibility(qwidget, qwidget->windowState()); + if (parentWindow->isWindow()) + S60->setRecursiveDecorationsVisibility(parentWindow, parentWindow->windowState()); #endif } else { - QWidget *parentWindow = qwidget->window(); if (QApplication::activeWindow() == parentWindow && !hasFocusedAndVisibleChild(parentWindow)) { if (CCoeEnv::Static()->AppUi()->IsDisplayingMenuOrDialog() || S60->menuBeingConstructed) { QWidget *fw = QApplication::focusWidget(); |