Title: [122833] trunk/Tools
- Revision
- 122833
- Author
- kbal...@webkit.org
- Date
- 2012-07-17 03:36:35 -0700 (Tue, 17 Jul 2012)
Log Message
[Qt] Add --use-test-fonts option to Minibrowser
https://bugs.webkit.org/show_bug.cgi?id=91402
Reviewed by Tor Arne Vestbø.
Same stuff that already exists for QtTestBrowser.
* MiniBrowser/qt/MiniBrowser.pro:
* MiniBrowser/qt/MiniBrowserApplication.cpp:
(MiniBrowserApplication::handleUserOptions):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (122832 => 122833)
--- trunk/Tools/ChangeLog 2012-07-17 10:23:27 UTC (rev 122832)
+++ trunk/Tools/ChangeLog 2012-07-17 10:36:35 UTC (rev 122833)
@@ -1,3 +1,16 @@
+2012-07-17 Balazs Kelemen <kbal...@webkit.org>
+
+ [Qt] Add --use-test-fonts option to Minibrowser
+ https://bugs.webkit.org/show_bug.cgi?id=91402
+
+ Reviewed by Tor Arne Vestbø.
+
+ Same stuff that already exists for QtTestBrowser.
+
+ * MiniBrowser/qt/MiniBrowser.pro:
+ * MiniBrowser/qt/MiniBrowserApplication.cpp:
+ (MiniBrowserApplication::handleUserOptions):
+
2012-07-17 Adam Barth <aba...@webkit.org>
[Chromium] TestInterfaces should be responsible for owning and binding AccessibilityController and TextInputController
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowser.pro (122832 => 122833)
--- trunk/Tools/MiniBrowser/qt/MiniBrowser.pro 2012-07-17 10:23:27 UTC (rev 122832)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowser.pro 2012-07-17 10:36:35 UTC (rev 122833)
@@ -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 @@
utils.cpp \
HEADERS += \
+ $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/QtInitializeTestFonts.h \
BrowserWindow.h \
MiniBrowserApplication.h \
UrlLoader.h \
@@ -22,6 +29,8 @@
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
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (122832 => 122833)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2012-07-17 10:23:27 UTC (rev 122832)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2012-07-17 10:36:35 UTC (rev 122833)
@@ -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 @@
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())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
