Remove Qt cruft from webkitpy
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Jun 2014 14:45:51 +0000 (14:45 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Jun 2014 14:45:51 +0000 (14:45 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@170582 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/common/config/ports.py
Tools/Scripts/webkitpy/common/config/ports_unittest.py

index 5334ab831b381c14fe70a30eba86ff0cfeaea168..7cba26984252be3fcc079a4588c5916ce81a010e 100644 (file)
@@ -1,3 +1,23 @@
+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.
+
 2014-06-29  Yoav Weiss  <yoav@yoav.ws>
 
         Add support for HTMLImageElement's sizes attribute
index 5ad8d21a93e35cdda4c0fb7e738eaee85c0638a4..e4b54fd2039c4335e2eca51b617ccc6d20a65d77 100644 (file)
@@ -66,8 +66,6 @@ class DeprecatedPort(object):
             "mac": MacPort,
             "mac-wk2": MacWK2Port,
             "win": WinPort,
-            "qt": QtPort,
-            "qt-wk2": QtWK2Port,
             "efl-wk2": EflWK2Port,
         }
         default_port = {
@@ -158,38 +156,6 @@ class GtkWK2Port(DeprecatedPort):
         return command
 
 
-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
-
-
 class EflWK2Port(DeprecatedPort):
     port_flag_name = "efl-wk2"
 
index 0c66aafb8b2a69421aa332c152bbe7f8fe23a153..03ef50b57501ce1c4e92c04f6beb9fa604f0f930 100644 (file)
@@ -44,15 +44,3 @@ class DeprecatedPortTest(unittest.TestCase):
         self.assertEqual(GtkWK2Port().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk", "-2"])
         self.assertEqual(GtkWK2Port().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", "--no-webkit1", DeprecatedPort().makeArgs()])
         self.assertEqual(GtkWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", "--no-webkit1", DeprecatedPort().makeArgs()])
-
-    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()])