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 <webkit.review.bot@gmail.com> on 2011-09-20

* DumpRenderTree/qt/main.cpp:
(main):
* WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:
(WTR::activateFonts):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95544 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 17b0a7e..1068779 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2011-09-20  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <tomz@codeaurora.org>
 
         Fix patch and bug numbering in the mocktool simulation code

diff --git a/Tools/DumpRenderTree/qt/main.cpp b/Tools/DumpRenderTree/qt/main.cpp
index 7279e85..89a5128 100644 (file)
--- a/Tools/DumpRenderTree/qt/main.cpp
+++ b/Tools/DumpRenderTree/qt/main.cpp
@@ -144,8 +144,13 @@ int main(int argc, char* argv[])
     QApplication::setGraphicsSystem("raster");
     QApplication::setStyle(new QWindowsStyle);
 
-    QApplication app(argc, argv);
+    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);

diff --git a/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp b/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp
index 25b11b4..fba00bd 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp
@@ -90,6 +90,12 @@ void activateFonts()
     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);