diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-05-31 12:39:24 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-06-01 01:22:59 (GMT) |
| commit | 8cc94bc8c32f5fa72970a4981728a94f1bb97e9d (patch) | |
| tree | db0cbd5a19b789f1bd43992e140c74f837eec5bc | |
| parent | 7ca5fac50034163c7e60c4aa809adda769c36762 (diff) | |
| download | Qt-8cc94bc8c32f5fa72970a4981728a94f1bb97e9d.zip Qt-8cc94bc8c32f5fa72970a4981728a94f1bb97e9d.tar.gz Qt-8cc94bc8c32f5fa72970a4981728a94f1bb97e9d.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
(cherry picked from commit 4a4e5e7d54c559d54e9079dacb9c2fd32770f018)
| -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 ca1cd43..d88c346 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()); |