[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 557f3414ad320f18ccdaeb1adb1d903418245b78
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 28 13:39:14 2010 +0000

    Do not set the combobox font on Maemo5 and S60; use the
    default instead.
    
    Reviewed by Simon Hausmann.
    
    * WebCoreSupport/QtFallbackWebPopup.cpp:
    (WebCore::QtFallbackWebPopup::populate):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53999 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index d87a762..f9aa123 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-28  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        Do not set the combobox font on Maemo5 and S60; use the
+        default instead.
+
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopup::populate):
+
 2010-01-28  Trond Kjernåsen <trond at trolltech.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp b/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
index 42462e2..7ee2b7c 100644
--- a/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
+++ b/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
@@ -134,7 +134,9 @@ void QtFallbackWebPopup::populate()
     QStandardItemModel* model = qobject_cast<QStandardItemModel*>(m_combo->model());
     Q_ASSERT(model);
 
+#if !defined(Q_WS_S60) && !defined(Q_WS_MAEMO_5)
     m_combo->setFont(font());
+#endif
     for (int i = 0; i < itemCount(); ++i) {
         switch (itemType(i)) {
         case Separator:

-- 
WebKit Debian packaging