Commit c075d2a2 authored by lars's avatar lars

Move the Qt version of DRT into the correct place and put the binary into BUILDDIR/bin.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@25968 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2a96df2f
2007-10-03 Lars Knoll <lars@trolltech.com>
Reviewed by olliej.
Move the Qt version of DRT into the correct place and put the binary into BUILDDIR/bin.
* WebKit.pro:
2007-09-29 Holger Hans Peter Freyther <zecke@selfish.org>
Reviewed by Mark.
......
......@@ -10,7 +10,7 @@ SUBDIRS += \
qt-port {
SUBDIRS += WebKitQt/QtLauncher
!win32-*: SUBDIRS += WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
!win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
}
gtk-port:SUBDIRS += \
......
2007-10-03 Lars Knoll <lars@trolltech.com>
Reviewed by olliej.
Move the Qt version of DRT into the correct place and put the binary into BUILDDIR/bin.
* DumpRenderTree/qt/DumpRenderTree.cpp: Renamed from WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp.
(WebCore::WebFrame::WebFrame):
(WebCore::WebPage::WebPage):
(WebCore::WebPage::createFrame):
(WebCore::WebPage::javaScriptAlert):
(WebCore::WebPage::javaScriptConsoleMessage):
(WebCore::DumpRenderTree::DumpRenderTree):
(WebCore::DumpRenderTree::~DumpRenderTree):
(WebCore::DumpRenderTree::open):
(WebCore::DumpRenderTree::readStdin):
(WebCore::DumpRenderTree::resetJSObjects):
(WebCore::DumpRenderTree::initJSObjects):
(WebCore::DumpRenderTree::dumpFramesAsText):
(WebCore::DumpRenderTree::dump):
* DumpRenderTree/qt/DumpRenderTree.h: Renamed from WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.h.
(WebCore::DumpRenderTree::layoutTestController):
(WebCore::DumpRenderTree::eventSender):
* DumpRenderTree/qt/DumpRenderTree.pro: Renamed from WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro.
* DumpRenderTree/qt/fonts.conf: Renamed from WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/fonts.conf.
* DumpRenderTree/qt/fonts/AHEM____.TTF: Renamed from WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/fonts/AHEM____.TTF.
* DumpRenderTree/qt/jsobjects.cpp: Renamed from WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.cpp.
(HackWebFrame::mousePressEvent):
(HackWebFrame::mouseReleaseEvent):
(HackWebFrame::mouseMoveEvent):
(HackWebFrame::HackWebFrame):
(HackWebFrame::~HackWebFrame):
(LayoutTestController::LayoutTestController):
(LayoutTestController::reset):
(LayoutTestController::maybeDump):
(LayoutTestController::waitUntilDone):
(LayoutTestController::notifyDone):
(LayoutTestController::dumpEditingCallbacks):
(LayoutTestController::queueReload):
(LayoutTestController::provisionalLoad):
(LayoutTestController::timerEvent):
(EventSender::EventSender):
(EventSender::mouseDown):
(EventSender::mouseUp):
(EventSender::mouseMoveTo):
(EventSender::leapForward):
(EventSender::keyDown):
(EventSender::frameUnderMouse):
* DumpRenderTree/qt/jsobjects.h: Renamed from WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.h.
(LayoutTestController::isLoading):
(LayoutTestController::setLoading):
(LayoutTestController::shouldDumpAsText):
(LayoutTestController::shouldDumpChildrenAsText):
(LayoutTestController::shouldWaitUntilDone):
(LayoutTestController::dumpAsText):
(LayoutTestController::dumpChildFramesAsText):
* DumpRenderTree/qt/main.cpp: Renamed from WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/main.cpp.
(messageHandler):
(crashHandler):
(main):
* Scripts/run-webkit-tests:
2007-10-03 Mark Rowe <mrowe@apple.com>
Reviewed by Alp Toker.
......
......@@ -3,6 +3,7 @@ TARGET = DumpRenderTree
include(../../../WebKit.pri)
INCLUDEPATH += /usr/include/freetype2
INCLUDEPATH += ../../../JavaScriptCore/kjs
DESTDIR = ../../../bin
QT = core gui
......
......@@ -77,8 +77,8 @@ int main(int argc, char* argv[])
char currentPath[PATH_MAX+1];
getcwd(currentPath, PATH_MAX);
QByteArray configFile = currentPath;
configFile += "/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/fonts.conf";
if (!FcConfigParseAndLoad (config, (FcChar8*) configFile.data(), true))
configFile += "/WebKitTools/DumpRenderTree/qt/fonts.conf";
if (!FcConfigParseAndLoad (config, (FcChar8*) configFile.data(), true))
qFatal("Couldn't load font configuration file");
if (!FcConfigAppFontAddDir (config, (FcChar8*) fontDir.data()))
qFatal("Couldn't add font dir!");
......@@ -107,19 +107,19 @@ int main(int argc, char* argv[])
signal(SIGPIPE, crashHandler); /* 13: write on a pipe with no reader */
signal(SIGXCPU, crashHandler); /* 24: exceeded CPU time limit */
signal(SIGXFSZ, crashHandler); /* 25: exceeded file size limit */
QStringList args = app.arguments();
if (args.count() < 2) {
qDebug() << "Usage: DumpRenderTree [-v] filename";
exit(0);
}
// supress debug output from Qt if not started with -v
if (!args.contains(QLatin1String("-v")))
if (!args.contains(QLatin1String("-v")))
qInstallMsgHandler(messageHandler);
WebCore::DumpRenderTree dumper;
if (args.last() == QLatin1String("-")) {
dumper.open();
} else {
......
......@@ -249,7 +249,7 @@ $testHTTP = 0 if isQt();
setConfigurationProductDir(Cwd::abs_path($root)) if (defined($root));
my $productDir = productDir();
$productDir .= "/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj" if (isQt());
$productDir .= "/bin" if (isQt());
chdirWebKit();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment