diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-05-10 08:42:47 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-05-10 08:42:47 (GMT) |
| commit | 42d46a85a50926cd24d7216cb99b4084f6d8ad04 (patch) | |
| tree | 39a79b4709f6da1c04c60a5c3e5adf43c16f6169 /src/gui/s60framework | |
| parent | 37b45fe0415bd6695640b26eb7545280b2e8ffe1 (diff) | |
| parent | a863691765b1788a17a67e826f483b68f0f34066 (diff) | |
| download | Qt-42d46a85a50926cd24d7216cb99b4084f6d8ad04.zip Qt-42d46a85a50926cd24d7216cb99b4084f6d8ad04.tar.gz Qt-42d46a85a50926cd24d7216cb99b4084f6d8ad04.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/s60framework')
| -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); - } } /*! |