summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qsoftkeymanager_s60.cpp
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2010-04-20 07:59:27 (GMT)
committerJason Barron <jbarron@trolltech.com>2010-04-21 07:40:58 (GMT)
commit199caad8812128636a76816e931d24dcd2007af6 (patch)
tree86027a9d51183d207bdb34d2b8d7a3758249e51c /src/gui/kernel/qsoftkeymanager_s60.cpp
parent713910ac67da8ba4b96fc6fb0e350676fbd730d3 (diff)
downloadQt-199caad8812128636a76816e931d24dcd2007af6.zip
Qt-199caad8812128636a76816e931d24dcd2007af6.tar.gz
Qt-199caad8812128636a76816e931d24dcd2007af6.tar.bz2
Delay creation of S60 screen furniture.
Previously the S60 screen furniture (Status Pane and CBA) was being constructed when QApplication was constructed. This meant that if you never created a widget, you would still get those app panes which is not what we want. This patch avoids constructing these panes in QApplication, and manually creates them later when the first window is shown in a state where they would be needed. Reviewed-by: Janne Anttila Reviewed-by: mread
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager_s60.cpp')
-rw-r--r--src/gui/kernel/qsoftkeymanager_s60.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qsoftkeymanager_s60.cpp b/src/gui/kernel/qsoftkeymanager_s60.cpp
index c0761f0..f656e88 100644
--- a/src/gui/kernel/qsoftkeymanager_s60.cpp
+++ b/src/gui/kernel/qsoftkeymanager_s60.cpp
@@ -78,6 +78,8 @@ bool QSoftKeyManagerPrivateS60::skipCbaUpdate()
// Note: Cannot use IsDisplayingMenuOrDialog since CBA update can be triggered before
// menu/dialog CBA is actually displayed i.e. it is being costructed.
CEikButtonGroupContainer *appUiCba = S60->buttonGroupContainer();
+ if (!appUiCba)
+ return true;
// CEikButtonGroupContainer::Current returns 0 if CBA is not visible at all
CEikButtonGroupContainer *currentCba = CEikButtonGroupContainer::Current();
// Check if softkey need to be update even they are not visible