[Qt] Do not check specifically for version 5.0
authorallan.jensen@digia.com <allan.jensen@digia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Aug 2013 16:53:20 +0000 (16:53 +0000)
committerallan.jensen@digia.com <allan.jensen@digia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Aug 2013 16:53:20 +0000 (16:53 +0000)
https://bugs.webkit.org/show_bug.cgi?id=119846

Reviewed by Jocelyn Turcotte.

For Qt 5.x we should always use both wk1 and wk2 basepath results.

* Scripts/webkitpy/port/qt.py:
(QtPort._search_paths):

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

Tools/ChangeLog
Tools/Scripts/webkitpy/port/qt.py

index 5d18376..fe7cf4c 100644 (file)
@@ -1,3 +1,15 @@
+2013-08-15  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] Do not check specifically for version 5.0
+        https://bugs.webkit.org/show_bug.cgi?id=119846
+
+        Reviewed by Jocelyn Turcotte.
+
+        For Qt 5.x we should always use both wk1 and wk2 basepath results.
+
+        * Scripts/webkitpy/port/qt.py:
+        (QtPort._search_paths):
+
 2013-08-15  Simon Pena  <simon.pena@samsung.com>
 
         <https://webkit.org/b/119584> [Gtk] URL printing code in DumpRenderTree doesn't match WTR or Mac DRT
index 5dda762..5580318 100644 (file)
@@ -120,22 +120,22 @@ class QtPort(Port):
     def _search_paths(self):
         #                 qt-5.0-mac-wk2
         #                /
-        # qt-5.0-wk1    qt-5.0-wk2
-        #            \/
-        #         qt-5.0
-        #                \
+        #   qt-5.0-wk1  qt-5.0-wk2
+        #             \/
+        #           qt-5.0
+        #               \
         #    (qt-linux|qt-mac|qt-win)
         #                |
         #               qt
         search_paths = []
         version = self.qt_version()
-        if '5.0' in version:
-            if self.get_option('webkit_test_runner'):
-                if self.operating_system() == 'mac':
-                    search_paths.append('qt-5.0-mac-wk2')
-                search_paths.append('qt-5.0-wk2')
-            else:
-                search_paths.append('qt-5.0-wk1')
+        if self.get_option('webkit_test_runner'):
+            if self.operating_system() == 'mac':
+                search_paths.append('qt-5.0-mac-wk2')
+            search_paths.append('qt-5.0-wk2')
+        else:
+            search_paths.append('qt-5.0-wk1')
+
         search_paths.append('qt-5.0')
 
         search_paths.append(self.port_name + '-' + self.operating_system())