diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Tools/QtTestBrowser | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-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/QtTestBrowser')
| -rw-r--r-- | Tools/QtTestBrowser/QtTestBrowser.pro | 3 | ||||
| -rw-r--r-- | Tools/QtTestBrowser/qttestbrowser.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Tools/QtTestBrowser/QtTestBrowser.pro b/Tools/QtTestBrowser/QtTestBrowser.pro index f69606ab9..2fa9086d9 100644 --- a/Tools/QtTestBrowser/QtTestBrowser.pro +++ b/Tools/QtTestBrowser/QtTestBrowser.pro @@ -7,12 +7,12 @@ TEMPLATE = app INCLUDEPATH += \ + $${ROOT_WEBKIT_DIR}/Source/WebCore/platform/qt \ $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport \ $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/ \ $${ROOT_WEBKIT_DIR}/Source/WTF SOURCES += \ - $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp \ locationedit.cpp \ launcherwindow.cpp \ qttestbrowser.cpp \ @@ -25,7 +25,6 @@ SOURCES += \ cookiejar.cpp HEADERS += \ - $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/QtInitializeTestFonts.h \ locationedit.h \ launcherwindow.h \ mainwindow.h \ diff --git a/Tools/QtTestBrowser/qttestbrowser.cpp b/Tools/QtTestBrowser/qttestbrowser.cpp index 64cb26153..fcd13a204 100644 --- a/Tools/QtTestBrowser/qttestbrowser.cpp +++ b/Tools/QtTestBrowser/qttestbrowser.cpp @@ -31,7 +31,7 @@ */ #include "DumpRenderTreeSupportQt.h" -#include "QtInitializeTestFonts.h" +#include "QtTestSupport.h" #include "launcherwindow.h" #include "urlloader.h" @@ -241,7 +241,7 @@ void LauncherApplication::handleUserOptions() #endif if (args.contains("-use-test-fonts")) - WebKit::initializeTestFonts(); + WebKit::QtTestSupport::initializeTestFonts(); if (args.contains("-print-loaded-urls")) windowOptions.printLoadedUrls = true; |