<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170582] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170582">170582</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-30 07:45:51 -0700 (Mon, 30 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove Qt cruft from webkitpy
https://bugs.webkit.org/show_bug.cgi?id=134445
Patch by Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com> on 2014-06-30
Reviewed by Csaba Osztrogonác.
* Scripts/webkitpy/common/config/ports.py:
(DeprecatedPort.port):
(QtPort): Deleted.
(QtPort.build_webkit_command): Deleted.
(QtPort.run_webkit_tests_command): Deleted.
(QtWK2Port): Deleted.
(QtWK2Port.build_webkit_command): Deleted.
(QtWK2Port.run_webkit_tests_command): Deleted.
* Scripts/webkitpy/common/config/ports_unittest.py:
(DeprecatedPortTest): Deleted.
(DeprecatedPortTest.test_qt_port): Deleted.
(DeprecatedPortTest.test_qt_wk2_port): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigportspy">trunk/Tools/Scripts/webkitpy/common/config/ports.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigports_unittestpy">trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (170581 => 170582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-06-30 08:46:01 UTC (rev 170581)
+++ trunk/Tools/ChangeLog 2014-06-30 14:45:51 UTC (rev 170582)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-06-30 Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com>
+
+ Remove Qt cruft from webkitpy
+ https://bugs.webkit.org/show_bug.cgi?id=134445
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Scripts/webkitpy/common/config/ports.py:
+ (DeprecatedPort.port):
+ (QtPort): Deleted.
+ (QtPort.build_webkit_command): Deleted.
+ (QtPort.run_webkit_tests_command): Deleted.
+ (QtWK2Port): Deleted.
+ (QtWK2Port.build_webkit_command): Deleted.
+ (QtWK2Port.run_webkit_tests_command): Deleted.
+ * Scripts/webkitpy/common/config/ports_unittest.py:
+ (DeprecatedPortTest): Deleted.
+ (DeprecatedPortTest.test_qt_port): Deleted.
+ (DeprecatedPortTest.test_qt_wk2_port): Deleted.
+
</ins><span class="cx"> 2014-06-29 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Add support for HTMLImageElement's sizes attribute
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigportspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (170581 => 170582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2014-06-30 08:46:01 UTC (rev 170581)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2014-06-30 14:45:51 UTC (rev 170582)
</span><span class="lines">@@ -66,8 +66,6 @@
</span><span class="cx"> "mac": MacPort,
</span><span class="cx"> "mac-wk2": MacWK2Port,
</span><span class="cx"> "win": WinPort,
</span><del>- "qt": QtPort,
- "qt-wk2": QtWK2Port,
</del><span class="cx"> "efl-wk2": EflWK2Port,
</span><span class="cx"> }
</span><span class="cx"> default_port = {
</span><span class="lines">@@ -158,38 +156,6 @@
</span><span class="cx"> return command
</span><span class="cx">
</span><span class="cx">
</span><del>-class QtPort(DeprecatedPort):
- port_flag_name = "qt"
-
- def build_webkit_command(self, build_style=None):
- command = super(QtPort, self).build_webkit_command(build_style=build_style)
- command.append("--qt")
- command.append("--no-webkit2")
- command.append(super(QtPort, self).makeArgs())
- return command
-
- def run_webkit_tests_command(self):
- command = super(QtPort, self).run_webkit_tests_command()
- command.append("--qt")
- return command
-
-
-class QtWK2Port(DeprecatedPort):
- port_flag_name = "qt-wk2"
-
- def build_webkit_command(self, build_style=None):
- command = super(QtWK2Port, self).build_webkit_command(build_style=build_style)
- command.append("--qt")
- command.append(super(QtWK2Port, self).makeArgs())
- return command
-
- def run_webkit_tests_command(self):
- command = super(QtWK2Port, self).run_webkit_tests_command()
- command.append("--qt")
- command.append("-2")
- return command
-
-
</del><span class="cx"> class EflWK2Port(DeprecatedPort):
</span><span class="cx"> port_flag_name = "efl-wk2"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigports_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py (170581 => 170582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2014-06-30 08:46:01 UTC (rev 170581)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2014-06-30 14:45:51 UTC (rev 170582)
</span><span class="lines">@@ -44,15 +44,3 @@
</span><span class="cx"> self.assertEqual(GtkWK2Port().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk", "-2"])
</span><span class="cx"> self.assertEqual(GtkWK2Port().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", "--no-webkit1", DeprecatedPort().makeArgs()])
</span><span class="cx"> self.assertEqual(GtkWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", "--no-webkit1", DeprecatedPort().makeArgs()])
</span><del>-
- def test_qt_port(self):
- self.assertEqual(QtPort().flag(), "--port=qt")
- self.assertEqual(QtPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--qt"])
- self.assertEqual(QtPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--qt", "--no-webkit2", DeprecatedPort().makeArgs()])
- self.assertEqual(QtPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--qt", "--no-webkit2", DeprecatedPort().makeArgs()])
-
- def test_qt_wk2_port(self):
- self.assertEqual(QtWK2Port().flag(), "--port=qt-wk2")
- self.assertEqual(QtWK2Port().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--qt", "-2"])
- self.assertEqual(QtWK2Port().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--qt", DeprecatedPort().makeArgs()])
- self.assertEqual(QtWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--qt", DeprecatedPort().makeArgs()])
</del></span></pre>
</div>
</div>
</body>
</html>