Changeset 95541 in webkit

Timestamp:

Sep 20, 2011, 7:22:58 AM (14 years ago)

Author:

vestbo@webkit.org

Message:

[Qt] Don't override default QApplication font for DRT and WTR

Revision 95526 moved the relevant code below the QApplication
constructor, to fix a potential crash, and that made the code
take effect, breaking 6 tests.

We should rely on the QWebSettings to set default fonts, and
this QApplication::setFont() is a relic from when we didn't
have that option, so we remove the code.

Reviewed by Csaba Osztrogonác.

• DumpRenderTree/qt/main.cpp:
• WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/qt/main.cpp (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-20  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        [Qt] Don't override default QApplication font for DRT and WTR
+
+        Revision 95526 moved the relevant code below the QApplication
+        constructor, to fix a potential crash, and that made the code
+        take effect, breaking 6 tests.
+
+        We should rely on the QWebSettings to set default fonts, and
+        this QApplication::setFont() is a relic from when we didn't
+        have that option, so we remove the code.
+
+        Reviewed by Csaba Osztrogonác.
+
+        * DumpRenderTree/qt/main.cpp:
+        * WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:
+
 2011-09-20  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 

trunk/Tools/DumpRenderTree/qt/main.cpp

@@ -147 +147 @@
     QApplication app(argc, argv);
 
-    QFont f("Sans Serif");
-    f.setPointSize(9);
-    f.setWeight(QFont::Normal);
-    f.setStyle(QFont::StyleNormal);
-    QApplication::setFont(f);
-
 #ifdef Q_WS_X11
     QX11Info::setAppDpiY(0, 96);

trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp

@@ -91 +91 @@
     QApplication::setStyle(new QWindowsStyle);
 
-    QFont f(QLatin1String("Sans Serif"));
-    f.setPointSize(9);
-    f.setWeight(QFont::Normal);
-    f.setStyle(QFont::StyleNormal);
-    QApplication::setFont(f);
-
 #if defined(Q_WS_X11)
     QX11Info::setAppDpiX(0, 96);