diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-05-31 12:39:24 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-05-31 12:45:43 (GMT) |
| commit | 4a4e5e7d54c559d54e9079dacb9c2fd32770f018 (patch) | |
| tree | 8e86a081d50806eb8bae76a2ee68525c632bf4fc /src/gui | |
| parent | 50eda57f06bd42ce56695ec9d55c33e7173904a7 (diff) | |
| download | Qt-4a4e5e7d54c559d54e9079dacb9c2fd32770f018.zip Qt-4a4e5e7d54c559d54e9079dacb9c2fd32770f018.tar.gz Qt-4a4e5e7d54c559d54e9079dacb9c2fd32770f018.tar.bz2 | |
Always construct s60 screen furniture even if not used.
Not creating screen furniture in full screen caused regression
when swapping into idle screen and back on Nokia 5800.
Task-number: QTBUG-10985
Reviewed-by: Jason Barron
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index 02e7cb8..438c2a3 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -487,11 +487,8 @@ void QWidgetPrivate::show_sys() && !S60->buttonGroupContainer() && !S60->statusPane()) { bool isFullscreen = q->windowState() & Qt::WindowFullScreen; - bool cbaRequested = q->windowFlags() & Qt::WindowSoftkeysVisibleHint; - // If the window is fullscreen and has not explicitly requested that the CBA be visible - // we delay the creation even more. - if ((!isFullscreen || cbaRequested) && !q->testAttribute(Qt::WA_DontShowOnScreen)) { + if (!q->testAttribute(Qt::WA_DontShowOnScreen)) { // Create the status pane and CBA here CEikAppUi *ui = static_cast<CEikAppUi *>(S60->appUi()); |