diff options
author | Jason Barron <jbarron@trolltech.com> | 2010-04-20 07:59:27 (GMT) |
---|---|---|
committer | Jason Barron <jbarron@trolltech.com> | 2010-04-21 07:40:58 (GMT) |
commit | 199caad8812128636a76816e931d24dcd2007af6 (patch) | |
tree | 86027a9d51183d207bdb34d2b8d7a3758249e51c /src/gui/s60framework/qs60mainappui.cpp | |
parent | 713910ac67da8ba4b96fc6fb0e350676fbd730d3 (diff) | |
download | Qt-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/s60framework/qs60mainappui.cpp')
-rw-r--r-- | src/gui/s60framework/qs60mainappui.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/gui/s60framework/qs60mainappui.cpp b/src/gui/s60framework/qs60mainappui.cpp index 3b5b9d3..feffc9f 100644 --- a/src/gui/s60framework/qs60mainappui.cpp +++ b/src/gui/s60framework/qs60mainappui.cpp @@ -112,16 +112,10 @@ void QS60MainAppUi::ConstructL() // ENoAppResourceFile and ENonStandardResourceFile makes UI to work without // resource files in most SDKs. S60 3rd FP1 public seems to require resource file // even these flags are defined - TInt flags = CAknAppUi::EAknEnableSkin; - if (QApplication::testAttribute(Qt::AA_S60DontConstructApplicationPanes)) { - flags |= CAknAppUi::ENoScreenFurniture | CAknAppUi::ENonStandardResourceFile; - } + TInt flags = CAknAppUi::EAknEnableSkin + | CAknAppUi::ENoScreenFurniture + | CAknAppUi::ENonStandardResourceFile; BaseConstructL(flags); - - if (!QApplication::testAttribute(Qt::AA_S60DontConstructApplicationPanes)) { - CEikButtonGroupContainer* nativeContainer = Cba(); - nativeContainer->SetCommandSetL(R_AVKON_SOFTKEYS_EMPTY_WITH_IDS); - } } /*! |