From 6c2cabdc96c48637b18a1cb294d38e4ddb2f280d Mon Sep 17 00:00:00 2001 From: Iain Date: Thu, 20 Aug 2009 20:44:20 +0200 Subject: Fix build problem when Q_WS_S60 is undefined Reviewed-by: Jason Barron --- src/gui/styles/qs60style_s60.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index 85f0ae4..bc218cd 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -1358,6 +1358,7 @@ QS60Style::QS60Style() { } +#ifdef Q_WS_S60 void QS60StylePrivate::handleDynamicLayoutVariantSwitch() { clearCaches(QS60StylePrivate::CC_LayoutChange); @@ -1379,6 +1380,7 @@ void QS60StylePrivate::handleSkinChange() topLevelWidget->ensurePolished(); } } +#endif // Q_WS_S60 QT_END_NAMESPACE -- cgit v0.12 From c6afcca18ee4a8178566dca264734849fa6dfb11 Mon Sep 17 00:00:00 2001 From: Iain Date: Thu, 20 Aug 2009 21:03:25 +0200 Subject: Fix build error when Q_WS_S60 is undefined Reviewed-by: Jason Barron --- src/gui/widgets/qmenu.h | 2 +- src/gui/widgets/qmenu_symbian.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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) { -- cgit v0.12