diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-10-06 23:56:02 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-10-06 23:56:02 (GMT) |
commit | b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7 (patch) | |
tree | ac169cc9df2ff639e81b15dcaf268ed09d2e16cb /src/gui/widgets/qmenu.h | |
parent | 5584feca163e91588f08b0aa1f3ae2817cd90823 (diff) | |
parent | d7fe798e022884dcbc58844e686a7d4fd39cf027 (diff) | |
download | Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.zip Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.tar.gz Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/widgets/qmenu.h')
-rw-r--r-- | src/gui/widgets/qmenu.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/gui/widgets/qmenu.h b/src/gui/widgets/qmenu.h index 3d41727..0346a55 100644 --- a/src/gui/widgets/qmenu.h +++ b/src/gui/widgets/qmenu.h @@ -52,19 +52,11 @@ #endif QT_BEGIN_HEADER -#ifdef Q_WS_S60 - class CEikMenuPane; -#endif QT_BEGIN_NAMESPACE QT_MODULE(Gui) -#ifdef Q_WS_S60 -void qt_symbian_show_toplevel(CEikMenuPane* menuPane); -void qt_symbian_show_submenu(CEikMenuPane* menuPane, int id); -#endif // Q_WS_S60 - #ifndef QT_NO_MENU class QMenuPrivate; |