summaryrefslogtreecommitdiff
path: root/Tools/WebKitTestRunner/qt/main.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-11-07 11:22:47 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2012-11-07 11:22:47 +0100
commitcfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch)
tree24d68c6f61c464ecba1e05670b80390ea3b0e50c /Tools/WebKitTestRunner/qt/main.cpp
parent69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff)
downloadqtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Tools/WebKitTestRunner/qt/main.cpp')
-rw-r--r--Tools/WebKitTestRunner/qt/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/WebKitTestRunner/qt/main.cpp b/Tools/WebKitTestRunner/qt/main.cpp
index 31b750681..3c9d311c9 100644
--- a/Tools/WebKitTestRunner/qt/main.cpp
+++ b/Tools/WebKitTestRunner/qt/main.cpp
@@ -26,7 +26,7 @@
#include "config.h"
-#include "QtInitializeTestFonts.h"
+#include "QtTestSupport.h"
#include "TestController.h"
#include "qquickwebview_p.h"
@@ -119,7 +119,7 @@ int main(int argc, char** argv)
qputenv("QT_WEBKIT_THEME_NAME", "qstyle");
- WebKit::initializeTestFonts();
+ WebKit::QtTestSupport::initializeTestFonts();
QCoreApplication::setAttribute(Qt::AA_Use96Dpi, true);
QQuickWebViewExperimental::setFlickableViewportEnabled(false);