Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

Conflicts fixed:
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/eabi/QtGuiu.def

7 files changed, 74 insertions, 24 deletions

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index 8be049818b..c44a95b324 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-0eee8df53d1873669a9dda8f9c0340543258a316
+cd3aee284bddf4ff9d26f3bcaa7c33d478e81e10
diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog
index 1f067bf0e3..14d6da34aa 100644
--- a/src/3rdparty/webkit/ChangeLog
+++ b/src/3rdparty/webkit/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-01  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Rubber-stamped by Laszlo Gombos.
+
+        [Qt][Symbian] Bumped up the maximum heap size to 96MB
+
+        * WebKit.pri:
+
 2010-06-17  Alexis Menard  <alexis.menard@nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 56e2c010af..aa574b42fb 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from
 
 and has the sha1 checksum
 
-        0eee8df53d1873669a9dda8f9c0340543258a316
+        cd3aee284bddf4ff9d26f3bcaa7c33d478e81e10
diff --git a/src/3rdparty/webkit/WebKit.pri b/src/3rdparty/webkit/WebKit.pri
index fcd289188d..a080c437e9 100644
--- a/src/3rdparty/webkit/WebKit.pri
+++ b/src/3rdparty/webkit/WebKit.pri
@@ -30,7 +30,7 @@ building-libs {
                 LIBS += -lQtWebKit
                 symbian {
                     TARGET.EPOCSTACKSIZE = 0x14000 // 80 kB
-                    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 // Min 128kB, Max 32MB
+                    TARGET.EPOCHEAPSIZE = 0x20000 0x6000000 // Min 128kB, Max 32MB
                 }
             }
         }
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index acf1695362..1eb7b11bdf 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,41 @@
+2010-07-01  Bea Lam  <bea.lam@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Doc improvements for QDeclarativeWebView
+
+        * declarative/qdeclarativewebview.cpp:
+
+2010-07-01  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Create QComboBoxes when clicked and destroy on hide.
+        https://bugs.webkit.org/show_bug.cgi?id=41451
+
+        Currently a QComboBox is created for each RenderMenuList and
+        it gets destroyed either when the RenderMenuList or the
+        QWebView (its Qt parent) is destroyed. This cause a crash
+        when the QWebView is destroyed before the render tree (which
+        is kept in cache).
+
+        This patch aim to destroy the QComboBox as soon as its popup
+        gets hidden, and likewise, create it only when the popup is
+        requested to be shown.
+        It also removes the unneeded reference to the QGraphicsProxyWidget,
+        destroying the QComboBox automatically destroys its bound
+        proxywidget.
+
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopupCombo::hidePopup):
+        (WebCore::QtFallbackWebPopup::QtFallbackWebPopup):
+        (WebCore::QtFallbackWebPopup::~QtFallbackWebPopup):
+        (WebCore::QtFallbackWebPopup::show):
+        (WebCore::QtFallbackWebPopup::hide):
+        (WebCore::QtFallbackWebPopup::destroyPopup):
+        (WebCore::QtFallbackWebPopup::populate):
+        * WebCoreSupport/QtFallbackWebPopup.h:
+
 2010-06-30  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
index 1a87463924..59ac87be4c 100644
--- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
@@ -75,14 +75,12 @@ void QtFallbackWebPopupCombo::hidePopup()
 
     QComboBox::hidePopup();
 
-    if (QGraphicsProxyWidget* proxy = graphicsProxyWidget())
-        proxy->setVisible(false);
-
     if (!m_ownerPopup.m_popupVisible)
         return;
 
     m_ownerPopup.m_popupVisible = false;
     m_ownerPopup.popupDidHide();
+    m_ownerPopup.destroyPopup();
 }
 
 bool QtFallbackWebPopupCombo::eventFilter(QObject* watched, QEvent* event)
@@ -102,19 +100,13 @@ bool QtFallbackWebPopupCombo::eventFilter(QObject* watched, QEvent* event)
 QtFallbackWebPopup::QtFallbackWebPopup()
     : QtAbstractWebPopup()
     , m_popupVisible(false)
-    , m_combo(new QtFallbackWebPopupCombo(*this))
-    , m_proxy(0)
+    , m_combo(0)
 {
-    connect(m_combo, SIGNAL(activated(int)),
-            SLOT(activeChanged(int)), Qt::QueuedConnection);
 }
 
 QtFallbackWebPopup::~QtFallbackWebPopup()
 {
-    // If we create a proxy, then the deletion of the proxy and the
-    // combo will be done by the proxy's parent (QGraphicsWebView)
-    if (!m_proxy && m_combo)
-        m_combo->deleteLater();
+    destroyPopup();
 }
 
 void QtFallbackWebPopup::show()
@@ -125,17 +117,20 @@ void QtFallbackWebPopup::show()
 #if ENABLE(SYMBIAN_DIALOG_PROVIDERS)
     TRAP_IGNORE(showS60BrowserDialog());
 #else
+
+    destroyPopup();
+    m_combo = new QtFallbackWebPopupCombo(*this);
+    connect(m_combo, SIGNAL(activated(int)),
+            SLOT(activeChanged(int)), Qt::QueuedConnection);
+
     populate();
     m_combo->setCurrentIndex(currentIndex());
 
     QRect rect = geometry();
     if (QGraphicsWebView *webView = qobject_cast<QGraphicsWebView*>(pageClient()->pluginParent())) {
-        if (!m_proxy) {
-            m_proxy = new QGraphicsProxyWidget(webView);
-            m_proxy->setWidget(m_combo);
-        } else
-            m_proxy->setVisible(true);
-        m_proxy->setGeometry(rect);
+        QGraphicsProxyWidget* proxy = new QGraphicsProxyWidget(webView);
+        proxy->setWidget(m_combo);
+        proxy->setGeometry(rect);
     } else {
         m_combo->setParent(pageClient()->ownerWidget());
         m_combo->setGeometry(QRect(rect.left(), rect.top(),
@@ -204,13 +199,21 @@ void QtFallbackWebPopup::showS60BrowserDialog()
 
 void QtFallbackWebPopup::hide()
 {
-    m_combo->hidePopup();
+    // Destroying the QComboBox here cause problems if the popup is in the
+    // middle of its show animation. Instead we rely on the fact that the
+    // Qt::Popup window will hide itself on mouse events outside its window.
 }
 
-void QtFallbackWebPopup::populate()
+void QtFallbackWebPopup::destroyPopup()
 {
-    m_combo->clear();
+    if (m_combo) {
+        m_combo->deleteLater();
+        m_combo = 0;
+    }
+}
 
+void QtFallbackWebPopup::populate()
+{
     QStandardItemModel* model = qobject_cast<QStandardItemModel*>(m_combo->model());
     Q_ASSERT(model);
 
diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h
index 860e9fa15d..e6c371fb4f 100644
--- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h
+++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h
@@ -42,6 +42,8 @@ public:
     virtual void show();
     virtual void hide();
 
+    void destroyPopup();
+
 private slots:
     void activeChanged(int);
 
@@ -49,7 +51,6 @@ private:
     friend class QtFallbackWebPopupCombo;
     bool m_popupVisible;
     QtFallbackWebPopupCombo* m_combo;
-    QGraphicsProxyWidget* m_proxy;
 
     void populate();
 #if ENABLE(SYMBIAN_DIALOG_PROVIDERS)