[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[kbalazs at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 623d6473b4ea95dfca032226caaac38eadf74a88
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 16:29:11 2011 +0000

    2011-01-27  Balazs Kelemen  <kbalazs at webkit.org>
    
            Reviewed by Csaba Osztrogonác.
    
            [Qt][WK2] WTR should be initialized in the same way as DRT
            https://bugs.webkit.org/show_bug.cgi?id=53240
    
            * WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:
            (WTR::activateFonts): Added missing initialization steps.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76803 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 1446c58..99752dd 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-27  Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt][WK2] WTR should be initialized in the same way as DRT
+        https://bugs.webkit.org/show_bug.cgi?id=53240
+
+        * WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:
+        (WTR::activateFonts): Added missing initialization steps.
+
 2011-01-27  Joone Hur <joone.hur at collabora.co.uk>
 
         Unreviewed. 
diff --git a/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp b/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp
index d8166d0..9c4bc68 100644
--- a/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp
@@ -29,10 +29,13 @@
 
 #include "ActivateFonts.h"
 
+#include <QApplication>
 #include <QByteArray>
 #include <QDir>
+#include <QWindowsStyle>
 
 #ifdef Q_WS_X11
+#include <QX11Info>
 #include <fontconfig/fontconfig.h>
 #endif
 
@@ -43,6 +46,8 @@ namespace WTR {
 void activateFonts()
 {
 #if defined(Q_WS_X11)
+    FcInit();
+
     static int numFonts = -1;
 
     // Some test cases may add or remove application fonts (via @font-face).
@@ -78,6 +83,18 @@ void activateFonts()
     appFontSet = FcConfigGetFonts(config, FcSetApplication);
     numFonts = appFontSet->nfont;
 #endif
+
+    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);
+
+    QX11Info::setAppDpiX(0, 96);
+    QX11Info::setAppDpiY(0, 96);
 }
 
 }

-- 
WebKit Debian packaging