Title: [154107] trunk/Tools
- Revision
- 154107
- Author
- [email protected]
- Date
- 2013-08-15 09:53:20 -0700 (Thu, 15 Aug 2013)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (154106 => 154107)
--- trunk/Tools/ChangeLog 2013-08-15 16:52:40 UTC (rev 154106)
+++ trunk/Tools/ChangeLog 2013-08-15 16:53:20 UTC (rev 154107)
@@ -1,3 +1,15 @@
+2013-08-15 Allan Sandfeld Jensen <[email protected]>
+
+ [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 <[email protected]>
<https://webkit.org/b/119584> [Gtk] URL printing code in DumpRenderTree doesn't match WTR or Mac DRT
Modified: trunk/Tools/Scripts/webkitpy/port/qt.py (154106 => 154107)
--- trunk/Tools/Scripts/webkitpy/port/qt.py 2013-08-15 16:52:40 UTC (rev 154106)
+++ trunk/Tools/Scripts/webkitpy/port/qt.py 2013-08-15 16:53:20 UTC (rev 154107)
@@ -120,22 +120,22 @@
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())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
