diff options
| author | Iain <qt-info@nokia.com> | 2009-08-20 19:03:25 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-08-20 19:03:25 (GMT) |
| commit | c6afcca18ee4a8178566dca264734849fa6dfb11 (patch) | |
| tree | f33a15dbe8d471ce45c497bf75a8c3e9e3179e84 /src/gui | |
| parent | 5f312095bf30aa54ba45a98c2db777fb57b6aee8 (diff) | |
| download | Qt-c6afcca18ee4a8178566dca264734849fa6dfb11.zip Qt-c6afcca18ee4a8178566dca264734849fa6dfb11.tar.gz Qt-c6afcca18ee4a8178566dca264734849fa6dfb11.tar.bz2 | |
Fix build error when Q_WS_S60 is undefined
Reviewed-by: Jason Barron
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/qmenu.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/qmenu_symbian.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenu.h b/src/gui/widgets/qmenu.h index c180fea..14ba5f6 100644 --- a/src/gui/widgets/qmenu.h +++ b/src/gui/widgets/qmenu.h @@ -63,7 +63,7 @@ QT_MODULE(Gui) #ifdef Q_WS_S60 IMPORT_C void qt_symbian_show_toplevel(CEikMenuPane* menuPane); IMPORT_C void qt_symbian_show_submenu(CEikMenuPane* menuPane, int id); -#endif +#endif // Q_WS_S60 #ifndef QT_NO_MENU diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp index e4079c5..dc92b07 100644 --- a/src/gui/widgets/qmenu_symbian.cpp +++ b/src/gui/widgets/qmenu_symbian.cpp @@ -238,6 +238,7 @@ static void rebuildMenu() } } +#ifdef Q_WS_S60 Q_GUI_EXPORT void qt_symbian_show_toplevel( CEikMenuPane* menuPane) { if (!menuExists()) @@ -255,6 +256,7 @@ Q_GUI_EXPORT void qt_symbian_show_submenu( CEikMenuPane* menuPane, int id) QT_TRAP_THROWING(menuPane->AddMenuItemL(menu->children.at(i)->menuItemData)); } } +#endif // Q_WS_S60 void QMenuBarPrivate::symbianCommands(int command) { |