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: svn://svn.chromium.org/blink/trunk@53999 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebKit/qt/ChangeLog

+2010-01-28  Kenneth Rohde Christiansen  <kenneth@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@trolltech.com>
 
         Reviewed by Simon Hausmann.

third_party/WebKit/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: