summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-09-22 11:44:28 (GMT)
committeraxis <qt-info@nokia.com>2009-09-22 13:32:05 (GMT)
commit4a157ee126fc482cd1954b80f22f790ec544e241 (patch)
tree78b3cb383ca038cf520fccec3ffc25df209e8ca4 /src
parent770208fd7e26bf2b7a257a0865f38532144f1c2c (diff)
downloadQt-4a157ee126fc482cd1954b80f22f790ec544e241.zip
Qt-4a157ee126fc482cd1954b80f22f790ec544e241.tar.gz
Qt-4a157ee126fc482cd1954b80f22f790ec544e241.tar.bz2
Prevented export of some internal functions.
These should not be exported anymore after commit c13b97f2. RevBy: Jason Barron
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qmenu.h4
-rw-r--r--src/gui/widgets/qmenu_symbian.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/qmenu.h b/src/gui/widgets/qmenu.h
index 1f77442..3d41727 100644
--- a/src/gui/widgets/qmenu.h
+++ b/src/gui/widgets/qmenu.h
@@ -61,8 +61,8 @@ QT_BEGIN_NAMESPACE
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);
+void qt_symbian_show_toplevel(CEikMenuPane* menuPane);
+void qt_symbian_show_submenu(CEikMenuPane* menuPane, int id);
#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 13830ba..6fc4371 100644
--- a/src/gui/widgets/qmenu_symbian.cpp
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -222,7 +222,7 @@ static void rebuildMenu()
}
#ifdef Q_WS_S60
-Q_GUI_EXPORT void qt_symbian_show_toplevel( CEikMenuPane* menuPane)
+void qt_symbian_show_toplevel( CEikMenuPane* menuPane)
{
if (!menuExists())
return;
@@ -231,7 +231,7 @@ Q_GUI_EXPORT void qt_symbian_show_toplevel( CEikMenuPane* menuPane)
QT_TRAP_THROWING(menuPane->AddMenuItemL(symbianMenus.at(i)->menuItemData));
}
-Q_GUI_EXPORT void qt_symbian_show_submenu( CEikMenuPane* menuPane, int id)
+void qt_symbian_show_submenu( CEikMenuPane* menuPane, int id)
{
SymbianMenuItem* menu = qt_symbian_find_menu(id, symbianMenus);
if (menu) {