diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-08 14:43:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-08 14:43:24 (GMT) |
| commit | 526705430be6371166464689e970752a5ce41ed6 (patch) | |
| tree | 37dace9484f02dad4fe6fc99a9f97b62fa90c0e9 /src/gui | |
| parent | b3f22c1e9568e0e9b6c2898a879032f725587351 (diff) | |
| parent | e6cdf5833655f6bf4fae3166b2c1955e56cfc9a1 (diff) | |
| download | Qt-526705430be6371166464689e970752a5ce41ed6.zip Qt-526705430be6371166464689e970752a5ce41ed6.tar.gz Qt-526705430be6371166464689e970752a5ce41ed6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Let's not duplicate Symbian softkey menu top-level actions in submenu.
Remove some .pro statements left behind after IAP usage cleanup
Ignore MAKEFILE variable for Symbian abld and sbsv2 builds.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qsoftkeymanager_s60.cpp b/src/gui/kernel/qsoftkeymanager_s60.cpp index 6325d95..fee1580 100644 --- a/src/gui/kernel/qsoftkeymanager_s60.cpp +++ b/src/gui/kernel/qsoftkeymanager_s60.cpp @@ -401,7 +401,7 @@ bool QSoftKeyManagerPrivateS60::handleCommand(int command) foreach(QAction *menuAction, action->menu()->actions()) { QMenu *menu = menuAction->menu(); if(menu) - menuBar->addMenu(action->menu()); + menuBar->addMenu(menu); else menuBar->addAction(menuAction); } |