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

6 files changed, 53 insertions, 17 deletions

diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index 469225e..c55c2da 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -27,4 +27,10 @@ QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtCore.dynlist
 
 contains(DEFINES,QT_EVAL):include(eval.pri)
 
-symbian:TARGET.UID3=0x2001B2DC
\ No newline at end of file
+symbian: {
+    TARGET.UID3=0x2001B2DC
+
+    # Workaroud for problems with paging this dll
+    MMP_RULES -= PAGED
+    MMP_RULES *= UNPAGED
+}
\ No newline at end of file
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp
index b0aa7b6..ef562f4 100644
--- a/src/gui/dialogs/qdialog.cpp
+++ b/src/gui/dialogs/qdialog.cpp
@@ -67,7 +67,9 @@ extern bool qt_wince_is_smartphone(); //is defined in qguifunctions_wce.cpp
 #elif defined(Q_WS_S60)
 #  include "qfiledialog.h"
 #endif
-
+#if defined(Q_OS_SYMBIAN)
+#include "qmenubar.h"
+#endif
 #ifndef SPI_GETSNAPTODEFBUTTON
 #  define SPI_GETSNAPTODEFBUTTON  95
 #endif
@@ -488,6 +490,14 @@ int QDialog::exec()
 #endif //QT_NO_MENUBAR
 #endif //Q_OS_WINCE_WM
 
+#ifdef Q_OS_SYMBIAN
+#ifndef QT_NO_MENUBAR
+    QMenuBar *menuBar = 0;
+    if (!findChild<QMenuBar *>())
+        menuBar = new QMenuBar(this);
+#endif
+#endif
+    
 #if !defined(Q_WS_S60)
     show();
 #else
@@ -520,6 +530,13 @@ int QDialog::exec()
         delete menuBar;
 #endif //QT_NO_MENUBAR
 #endif //Q_OS_WINCE_WM
+#ifdef Q_OS_SYMBIAN
+#ifndef QT_NO_MENUBAR
+    else if (menuBar)
+        delete menuBar;
+#endif //QT_NO_MENUBAR
+#endif //Q_OS_SYMBIAN
+
     return res;
 }
 
diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp
index a50c5c0..9e53df5 100644
--- a/src/gui/widgets/qmenu_symbian.cpp
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE
 
 // ### FIX/Document this, we need some safe range of menu id's for Qt that don't clash with AIW ones
 #define QT_FIRST_MENU_ITEM 32000
-static QMenuBarPrivate *s60_menubar=0;
+static QList<QMenuBarPrivate *> s60_menubars;
 
 struct SymbianMenuItem
 {
@@ -167,7 +167,7 @@ static void setSoftkeys()
 {
     CEikButtonGroupContainer* cba = CEikonEnv::Static()->AppUiFactory()->Cba();
     if (cba){
-    if (s60_menubar)
+    if (s60_menubars.count()>0)
         cba->SetCommandSetL(R_AVKON_SOFTKEYS_OPTIONS_EXIT);
     else
         cba->SetCommandSetL(R_AVKON_SOFTKEYS_EXIT);
@@ -178,11 +178,11 @@ static void rebuildMenu()
 {
     qt_symbian_menu_static_cmd_id = QT_FIRST_MENU_ITEM;
     deleteAll( &symbianMenus );
-    if (!s60_menubar)
+    if (s60_menubars.count()==0)
         return;
-    for (int i = 0; i < s60_menubar->actions.size(); ++i) {
+    for (int i = 0; i < s60_menubars.last()->actions.size(); ++i) {
         QSymbianMenuAction *symbianActionTopLevel = new QSymbianMenuAction;
-        symbianActionTopLevel->action = s60_menubar->actions.at(i);
+        symbianActionTopLevel->action = s60_menubars.last()->actions.at(i);
         symbianActionTopLevel->parent = 0;
         symbianActionTopLevel->command = qt_symbian_menu_static_cmd_id++;
         qt_symbian_insert_action(symbianActionTopLevel, &symbianMenus);
@@ -193,7 +193,7 @@ static void rebuildMenu()
 
 Q_GUI_EXPORT void qt_symbian_show_toplevel( CEikMenuPane* menuPane)
 {
-    if (!s60_menubar)
+    if (s60_menubars.count()==0)
         return;
     rebuildMenu();
     for (int i = 0; i < symbianMenus.count(); ++i)
@@ -261,15 +261,17 @@ void QMenuBarPrivate::symbianDestroyMenuBar()
     Q_Q(QMenuBar);
     int index = nativeMenuBars.indexOf(q);
     nativeMenuBars.removeAt(index);
+    s60_menubars.removeLast();
+    rebuildMenu();
     if (symbian_menubar)
-      delete symbian_menubar;
+        delete symbian_menubar;
     symbian_menubar = 0;
 }
 
 QMenuBarPrivate::QSymbianMenuBarPrivate::QSymbianMenuBarPrivate(QMenuBarPrivate *menubar)
 {
     d = menubar;
-    s60_menubar = menubar;
+    s60_menubars.append(menubar);
 }
 
 QMenuBarPrivate::QSymbianMenuBarPrivate::~QSymbianMenuBarPrivate()
@@ -277,7 +279,7 @@ QMenuBarPrivate::QSymbianMenuBarPrivate::~QSymbianMenuBarPrivate()
     deleteAll( &symbianMenus );
     symbianMenus.clear();
     d = 0;
-    s60_menubar = 0;
+    rebuild();    
 }
 
 QMenuPrivate::QSymbianMenuPrivate::QSymbianMenuPrivate()
@@ -362,9 +364,10 @@ void QMenuBarPrivate::QSymbianMenuBarPrivate::removeAction(QSymbianMenuAction *a
 void QMenuBarPrivate::QSymbianMenuBarPrivate::rebuild()
 {
     setSoftkeys();
-    if (!s60_menubar)
+    if (s60_menubars.count()==0)
         return;
 
     rebuildMenu();
  }
+
 #endif //QT_NO_MENUBAR
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp
index b92f48b..b6ce76b 100644
--- a/src/gui/widgets/qmenubar.cpp
+++ b/src/gui/widgets/qmenubar.cpp
@@ -1045,6 +1045,12 @@ void QMenuBar::setVisible(bool visible)
     if(d->wce_menubar)
         return;
 #endif
+#ifdef Q_OS_SYMBIAN
+    Q_D(QMenuBar);
+    if(d->symbian_menubar)
+        return;
+#endif
+
     QWidget::setVisible(visible);
 }
 
diff --git a/src/s60installs/qt_libs.pro b/src/s60installs/qt_libs.pro
index 546c5b6..2ba8b79 100644
--- a/src/s60installs/qt_libs.pro
+++ b/src/s60installs/qt_libs.pro
@@ -42,11 +42,9 @@ symbian: {
     #ENDIF      
 
     qtlibraries.path = /sys/bin
-    qtlibraries.depends = "(0x20009a80), 1, 5, 0, {\"Symbian OS PIPS\"}"
+    qtlibraries.depends = "(0x20013851), 1, 5, 1, {\"PIPS Installer\"}"
     contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
-        qtlibraries.depends += "(0x200110CB), 1, 5, 0, {\"Open C LIBSSL Common\"}"
-        qtlibraries.depends += "(0x10281f34), 1, 5, 0, {\"Open C LIBSSL\"}"
-        qtlibraries.depends += "(0x2001B28B), 1, 5, 0, {\"OpenC LIBZ Support Files\"}"
+        qtlibraries.depends += "(0x200110CB), 1, 5, 1, {\"Open C LIBSSL Common\"}"
     }
     contains(QT_CONFIG, stl) {
         qtlibraries.depends += "(0x2000F866), 1, 0, 0, {\"Standard C++ Library Common\"}"
diff --git a/src/sql/sql.pro b/src/sql/sql.pro
index f089dd7..60be748 100644
--- a/src/sql/sql.pro
+++ b/src/sql/sql.pro
@@ -17,5 +17,11 @@ include(kernel/kernel.pri)
 include(drivers/drivers.pri)
 include(models/models.pri)
 
-symbian:TARGET.UID3=0x2001E61D
+symbian: {
+    TARGET.UID3=0x2001E61D
+    
+    # Workaroud for problems with paging this dll
+    MMP_RULES -= PAGED
+    MMP_RULES *= UNPAGED
+}