Title: [95544] trunk/Tools
- Revision
- 95544
- Author
- [email protected]
- Date
- 2011-09-20 08:46:29 -0700 (Tue, 20 Sep 2011)
Log Message
Unreviewed, rolling out r95526 and r95541.
http://trac.webkit.org/changeset/95526
http://trac.webkit.org/changeset/95541
https://bugs.webkit.org/show_bug.cgi?id=68443
It broke 6 tests (Requested by ossy_ on #webkit).
Patch by Sheriff Bot <[email protected]> on 2011-09-20
* DumpRenderTree/qt/main.cpp:
(main):
* WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:
(WTR::activateFonts):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (95543 => 95544)
--- trunk/Tools/ChangeLog 2011-09-20 15:43:07 UTC (rev 95543)
+++ trunk/Tools/ChangeLog 2011-09-20 15:46:29 UTC (rev 95544)
@@ -1,3 +1,17 @@
+2011-09-20 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r95526 and r95541.
+ http://trac.webkit.org/changeset/95526
+ http://trac.webkit.org/changeset/95541
+ https://bugs.webkit.org/show_bug.cgi?id=68443
+
+ It broke 6 tests (Requested by ossy_ on #webkit).
+
+ * DumpRenderTree/qt/main.cpp:
+ (main):
+ * WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:
+ (WTR::activateFonts):
+
2011-09-20 Tom Zakrajsek <[email protected]>
Fix patch and bug numbering in the mocktool simulation code
Modified: trunk/Tools/DumpRenderTree/qt/main.cpp (95543 => 95544)
--- trunk/Tools/DumpRenderTree/qt/main.cpp 2011-09-20 15:43:07 UTC (rev 95543)
+++ trunk/Tools/DumpRenderTree/qt/main.cpp 2011-09-20 15:46:29 UTC (rev 95544)
@@ -144,8 +144,13 @@
QApplication::setGraphicsSystem("raster");
QApplication::setStyle(new QWindowsStyle);
+ QFont f("Sans Serif");
+ f.setPointSize(9);
+ f.setWeight(QFont::Normal);
+ f.setStyle(QFont::StyleNormal);
+ QApplication::setFont(f);
+
QApplication app(argc, argv);
-
#ifdef Q_WS_X11
QX11Info::setAppDpiY(0, 96);
QX11Info::setAppDpiX(0, 96);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp (95543 => 95544)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp 2011-09-20 15:43:07 UTC (rev 95543)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp 2011-09-20 15:46:29 UTC (rev 95544)
@@ -90,6 +90,12 @@
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
