2 files changed, 22 insertions, 3 deletions
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);
 }
 
 }
diff --git a/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro b/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
index 92d31b8..24db4b8 100644
--- a/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
+++ b/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
@@ -43,11 +43,11 @@ HEADERS += \
     OBJECTS_DIR = obj/release
 }
 
-include(../../../../WebKit.pri)
+include(../../../../Source/WebKit.pri)
 include(../../../../Source/JavaScriptCore/JavaScriptCore.pri)
-addJavaScriptCoreLib(../../../../Source/JavaScriptCore)
+addJavaScriptCoreLib(../../../JavaScriptCore)
 include(../../../../Source/WebKit2/WebKit2.pri)
-addWebKit2Lib(../../../../Source/WebKit2)
+addWebKit2Lib(../../../WebKit2)
 
 INCLUDEPATH += \
     $$PWD \
@@ -56,6 +56,8 @@ INCLUDEPATH += \
     $$PWD/../Bindings \
     $$PWD/../../../../Source/JavaScriptCore \
     $$PWD/../../../../Source/JavaScriptCore/wtf \
+    $$PWD/../../../../Source/WebCore \
+    $$PWD/../../../../Source/WebCore/platform/text \
     $$PWD/../../../../Source/WebKit2 \
     $$PWD/../../../../Source/WebKit2/Shared \
     $$GENERATED_SOURCES_DIR