Merge Webkit at r70949: Initial merge by git.

Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e

1 files changed, 15 insertions, 0 deletions

diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py
index 4c8fa0a..af94acc 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py
@@ -31,6 +31,7 @@
 import logging
 import os
 import signal
+import sys
 
 import webkit
 
@@ -46,6 +47,17 @@ class QtPort(WebKitPort):
         kwargs.setdefault('port_name', 'qt')
         WebKitPort.__init__(self, **kwargs)
 
+    def baseline_search_path(self):
+        port_names = []
+        if sys.platform == 'linux2':
+            port_names.append("qt-linux")
+        elif sys.platform in ('win32', 'cygwin'):
+            port_names.append("qt-win")
+        elif sys.platform == 'darwin':
+            port_names.append("qt-mac")
+        port_names.append("qt")
+        return map(self._webkit_baseline_path, port_names)
+
     def _tests_for_other_platforms(self):
         # FIXME: This list could be dynamic based on platform name and
         # pushed into base.Port.
@@ -92,6 +104,9 @@ class QtPort(WebKitPort):
     def _path_to_driver(self):
         return self._build_path('bin/DumpRenderTree')
 
+    def _path_to_image_diff(self):
+        return self._build_path('bin/ImageDiff')
+
     def _path_to_webcore_library(self):
         return self._build_path('lib/libQtWebKit.so')