diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-24 04:07:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-24 04:07:33 (GMT) |
| commit | 70f711f1db76f2f675f6c0777a693d243199ab88 (patch) | |
| tree | 593ad3a732e89faf81350bd21df203b6267e60fe /src/gui/widgets | |
| parent | b8014934d6c6846caab55f57fc7e32196fe6492d (diff) | |
| parent | a50519ba225459a9d21209fe50a3a8fbd8081a19 (diff) | |
| download | Qt-70f711f1db76f2f675f6c0777a693d243199ab88.zip Qt-70f711f1db76f2f675f6c0777a693d243199ab88.tar.gz Qt-70f711f1db76f2f675f6c0777a693d243199ab88.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:
Compile fix
Changed Symbian pkg files to deploy from under epoc32
Remove internal custom pixel metric enums
Hotfix to const usage in 262e98f9a29385f99cd6f768632264e0b621dc01
Fixed S60 softkey implementation to use popup/modal dialog softkeys.
Fixed 'fullsreen with softkeys' mode not to expand under softkey area.
Fixed left softkey regression caused by 7829fe15 in Symbian.
QS60Style: Housekeeping
Custom pixel metric values cannot be inquired from outside the class
Adding custom pixel metrics requires cleaning and rebuilding of QtGui
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qmenu.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/qmenubar.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 42b7406..a9978f9 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -168,8 +168,8 @@ void QMenuPrivate::init() #ifdef QT_SOFTKEYS_ENABLED selectAction = QSoftKeyManager::createKeyedAction(QSoftKeyManager::SelectSoftKey, Qt::Key_Select, q); cancelAction = QSoftKeyManager::createKeyedAction(QSoftKeyManager::CancelSoftKey, Qt::Key_Back, q); - selectAction->setVisible(false); // Don't show these in the menu - cancelAction->setVisible(false); + selectAction->setPriority(QAction::HighPriority); + cancelAction->setPriority(QAction::HighPriority); q->addAction(selectAction); q->addAction(cancelAction); #endif diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index 13aa02b..e368d3d 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -1404,7 +1404,6 @@ void QMenuBarPrivate::handleReparent() if (!menuBarAction) { if (newParent) { menuBarAction = QSoftKeyManager::createAction(QSoftKeyManager::MenuSoftKey, newParent); - menuBarAction->setVisible(false); newParent->addAction(menuBarAction); } } else { |