Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public

3 files changed, 5 insertions, 1 deletions

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
 
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)
 {