Changeset 53999 in webkit

Timestamp:

Jan 28, 2010 5:39:14 AM (10 years ago)

Author:

kenneth@webkit.org

Message:

Do not set the combobox font on Maemo5 and S60; use the
default instead.

Reviewed by Simon Hausmann.

• WebCoreSupport/QtFallbackWebPopup.cpp:

(WebCore::QtFallbackWebPopup::populate):

Location:

trunk/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/QtFallbackWebPopup.cpp (modified) (1 diff)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+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>
 

trunk/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp

@@ -135 +135 @@
     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)) {