Title: [95541] trunk/Tools
- Revision
- 95541
- Author
- [email protected]
- Date
- 2011-09-20 07:22:58 -0700 (Tue, 20 Sep 2011)
Log 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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (95540 => 95541)
--- trunk/Tools/ChangeLog 2011-09-20 14:08:17 UTC (rev 95540)
+++ trunk/Tools/ChangeLog 2011-09-20 14:22:58 UTC (rev 95541)
@@ -1,5 +1,22 @@
2011-09-20 Tor Arne Vestbø <[email protected]>
+ [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ø <[email protected]>
+
WebKitTestRunner: Provide usage if run without arguments
If WTR is run without either one or more filenames, or
Modified: trunk/Tools/DumpRenderTree/qt/main.cpp (95540 => 95541)
--- trunk/Tools/DumpRenderTree/qt/main.cpp 2011-09-20 14:08:17 UTC (rev 95540)
+++ trunk/Tools/DumpRenderTree/qt/main.cpp 2011-09-20 14:22:58 UTC (rev 95541)
@@ -146,12 +146,6 @@
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);
QX11Info::setAppDpiX(0, 96);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp (95540 => 95541)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp 2011-09-20 14:08:17 UTC (rev 95540)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp 2011-09-20 14:22:58 UTC (rev 95541)
@@ -90,12 +90,6 @@
QApplication::setGraphicsSystem(QLatin1String("raster"));
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);
QX11Info::setAppDpiY(0, 96);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
