diff options
author | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-10-14 14:51:20 (GMT) |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-10-14 14:51:20 (GMT) |
commit | 1c313a529ff0893c43c3ccaabe92c4e015acf891 (patch) | |
tree | 4e9b735c04e6579763474dd844eef13a8985ac64 /src/gui/widgets/qmenu.h | |
parent | 7750f3821c7cd526c33bfa09378378da3980a2e6 (diff) | |
parent | 81bc22dbd71e2dd0e25156e753afc6d94d808de9 (diff) | |
download | Qt-1c313a529ff0893c43c3ccaabe92c4e015acf891.zip Qt-1c313a529ff0893c43c3ccaabe92c4e015acf891.tar.gz Qt-1c313a529ff0893c43c3ccaabe92c4e015acf891.tar.bz2 |
Merge branch '4.6' into lighthouse
Conflicts:
src/gui/kernel/qapplication.cpp
src/gui/kernel/qwidget.cpp
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; |