diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-03 12:00:22 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-03 12:00:22 (GMT) |
| commit | c5845e6ea9cafea836038e24e6072aaed8242ef1 (patch) | |
| tree | b361ec57fa22c38d509bb177fe323140dade5219 /src/gui/widgets/qmenubar_p.h | |
| parent | b2d43b06d1c1debcd42afbc7dfd85c4991c670d5 (diff) | |
| parent | 3d05a836cb0bc62e6dc31d297bada07ec60adc34 (diff) | |
| download | Qt-c5845e6ea9cafea836038e24e6072aaed8242ef1.zip Qt-c5845e6ea9cafea836038e24e6072aaed8242ef1.tar.gz Qt-c5845e6ea9cafea836038e24e6072aaed8242ef1.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys
Conflicts:
src/gui/kernel/qapplication_s60.cpp
Diffstat (limited to 'src/gui/widgets/qmenubar_p.h')
| -rw-r--r-- | src/gui/widgets/qmenubar_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenubar_p.h b/src/gui/widgets/qmenubar_p.h index 1b9bac7..429605a 100644 --- a/src/gui/widgets/qmenubar_p.h +++ b/src/gui/widgets/qmenubar_p.h @@ -260,7 +260,7 @@ public: void InsertNativeMenuItems(const QList<QAction*> &actions); } *symbian_menubar; - bool symbianCommands(int command); + static void symbianCommands(int command); #endif }; |