diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-18 13:59:13 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-18 13:59:28 +0200 |
| commit | 4d6084feccab99c0a7b3ecef26bb49c41dd50201 (patch) | |
| tree | fd1195897f551eee6d5a15d07ff5733b15aa2a5c /Tools/MiniBrowser | |
| parent | ae901828d4689ab9e89113f6b6ea8042b37a9fda (diff) | |
| download | qtwebkit-4d6084feccab99c0a7b3ecef26bb49c41dd50201.tar.gz | |
Imported WebKit commit ff52235a78888e5cb8e286a828a8698042200e67 (http://svn.webkit.org/repository/webkit/trunk@122948)
New snapshot that should fix the rendering issues recently introduced
Diffstat (limited to 'Tools/MiniBrowser')
| -rw-r--r-- | Tools/MiniBrowser/efl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tools/MiniBrowser/efl/main.c | 1 | ||||
| -rw-r--r-- | Tools/MiniBrowser/qt/MiniBrowser.pro | 9 | ||||
| -rw-r--r-- | Tools/MiniBrowser/qt/MiniBrowserApplication.cpp | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/Tools/MiniBrowser/efl/CMakeLists.txt b/Tools/MiniBrowser/efl/CMakeLists.txt index a6fd2d57e..59cfc4fd1 100644 --- a/Tools/MiniBrowser/efl/CMakeLists.txt +++ b/Tools/MiniBrowser/efl/CMakeLists.txt @@ -55,6 +55,8 @@ ADD_CUSTOM_TARGET(forwarding-headerMiniBrowserSoup COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${MiniBrowser_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup ) +ADD_DEFINITIONS(-DTHEME_DIR=\"${THEME_BINARY_DIR}\") + INCLUDE_DIRECTORIES(${MiniBrowser_INCLUDE_DIRECTORIES}) ADD_EXECUTABLE(MiniBrowser ${MiniBrowser_SOURCES}) diff --git a/Tools/MiniBrowser/efl/main.c b/Tools/MiniBrowser/efl/main.c index f1614aa35..a979f5e55 100644 --- a/Tools/MiniBrowser/efl/main.c +++ b/Tools/MiniBrowser/efl/main.c @@ -163,6 +163,7 @@ static MiniBrowser *browserCreate(const char *url) /* Create webview */ app->browser = ewk_view_add(app->evas); + ewk_view_theme_set(app->browser, THEME_DIR"/default.edj"); evas_object_name_set(app->browser, "browser"); evas_object_smart_callback_add(app->browser, "load,error", on_error, app); diff --git a/Tools/MiniBrowser/qt/MiniBrowser.pro b/Tools/MiniBrowser/qt/MiniBrowser.pro index d54efad2f..e4530512c 100644 --- a/Tools/MiniBrowser/qt/MiniBrowser.pro +++ b/Tools/MiniBrowser/qt/MiniBrowser.pro @@ -6,7 +6,13 @@ TEMPLATE = app +WEBKIT += wtf + +INCLUDEPATH += \ + $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/ + SOURCES += \ + $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp \ BrowserWindow.cpp \ main.cpp \ MiniBrowserApplication.cpp \ @@ -14,6 +20,7 @@ SOURCES += \ utils.cpp \ HEADERS += \ + $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/QtInitializeTestFonts.h \ BrowserWindow.h \ MiniBrowserApplication.h \ UrlLoader.h \ @@ -22,6 +29,8 @@ HEADERS += \ TARGET = MiniBrowser DESTDIR = $${ROOT_BUILD_DIR}/bin +contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig + QT += network gui-private quick quick-private webkit webkit-private macx: QT += xml diff --git a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp index b85b234e1..f11f90d8c 100644 --- a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp +++ b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp @@ -29,6 +29,7 @@ #include "MiniBrowserApplication.h" #include "BrowserWindow.h" +#include "QtInitializeTestFonts.h" #include "private/qquickwebview_p.h" #include "utils.h" #include <QRegExp> @@ -324,6 +325,9 @@ void MiniBrowserApplication::handleUserOptions() m_windowOptions.setRequestedWindowSize(QSize(list.at(0).toInt(), list.at(1).toInt())); } + if (takeOptionFlag(&args, QStringLiteral("--use-test-fonts"))) + WebKit::initializeTestFonts(); + if (args.contains("-r")) { QString listFile = takeOptionValue(&args, "-r"); if (listFile.isEmpty()) |