diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 14:56:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 14:56:05 (GMT) |
| commit | 7a6a47255a858d6d0ea14158cc83125c2d4440dc (patch) | |
| tree | fc0f00de9e4a7ca9785b9153668a48af12900aee | |
| parent | a4c77a2cae0e4dfbccfe6db76153209b2a9d647f (diff) | |
| parent | 4a4e5e7d54c559d54e9079dacb9c2fd32770f018 (diff) | |
| download | Qt-7a6a47255a858d6d0ea14158cc83125c2d4440dc.zip Qt-7a6a47255a858d6d0ea14158cc83125c2d4440dc.tar.gz Qt-7a6a47255a858d6d0ea14158cc83125c2d4440dc.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Always construct s60 screen furniture even if not used.
| -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()); |