3 files changed, 9 insertions, 3 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 2a2f904..bbf8e1b 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -92,11 +92,13 @@ $Id$
 
 
 #ifndef DESKTOP_VERSION
 #include <qpe/ir.h>
+#include <qpe/qpemenubar.h>
 #include <qtopia/qcopenvelope_qws.h>
 #else
 
+#include <qmenubar.h>
 #endif
 
 #endif // KAB_EMBEDDED
 #include "kcmconfigs/kcmkabconfig.h"
@@ -1758,9 +1760,9 @@ void KABCore::addActionsManually()
   // tb->insertWidget(-1, 0, mIncSearchWidget);
 
 #else
   //US setup toolbar
-  QMenuBar   *menuBarTB = new QMenuBar( tb );
+  QPEMenuBar   *menuBarTB = new QPEMenuBar( tb );
   QPopupMenu *popupBarTB = new QPopupMenu( this );
   menuBarTB->insertItem( "ME", popupBarTB);
   tb->insertWidget(-1, 0, menuBarTB);
   mIncSearchWidget = new IncSearchWidget( tb );
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 6df95c6..5793a58 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -25,9 +25,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     setCaption( tr( "KOpieMail/Pi" ) );
     setToolBarsMovable( false ); 
     //KABC::StdAddressBook::self();
     toolBar = new QToolBar( this );
-    menuBar = new QMenuBar( toolBar );
+    menuBar = new QPEMenuBar( toolBar );
     mailMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( tr( "Mail" ), mailMenu );
     settingsMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( tr( "Settings" ), settingsMenu );
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index f5b81aa..680f0a9 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -7,9 +7,13 @@
 #include <qlistview.h>
 #include <qaction.h>
 
 #include <qtoolbar.h>
+#ifdef DESKTOP_VERSION
 #include <qmenubar.h>
+#else
+#include <qpe/qpemenubar.h>
+#endif
 
 #include "accountview.h"
 #include "statuswidget.h"
 
@@ -48,9 +52,9 @@ protected slots:
 
 protected:
     QToolBar *toolBar;
     StatusWidget *statusWidget;
-    QMenuBar *menuBar;
+    QPEMenuBar *menuBar;
     QPopupMenu *mailMenu, *settingsMenu;
     QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails,
             *editSettings, *editAccounts, *syncFolders;
     AccountView *folderView;