Title: [101169] trunk/Tools
Revision
101169
Author
[email protected]
Date
2011-11-25 06:19:03 -0800 (Fri, 25 Nov 2011)

Log Message

[Qt] Add support for using OWRT with Qt5
https://bugs.webkit.org/show_bug.cgi?id=72947

Add qt-5.0 platform and don't pass -graphicssystem to QtTestBrowser if using Qt5.

Patch by Ádám Kallai <[email protected]> on 2011-11-25
Reviewed by Csaba Osztrogonác.

* Scripts/old-run-webkit-tests:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (101168 => 101169)


--- trunk/Tools/ChangeLog	2011-11-25 14:17:10 UTC (rev 101168)
+++ trunk/Tools/ChangeLog	2011-11-25 14:19:03 UTC (rev 101169)
@@ -1,3 +1,14 @@
+2011-11-25  Ádám Kallai  <[email protected]>
+
+        [Qt] Add support for using OWRT with Qt5
+        https://bugs.webkit.org/show_bug.cgi?id=72947
+
+        Add qt-5.0 platform and don't pass -graphicssystem to QtTestBrowser if using Qt5.
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Scripts/old-run-webkit-tests:
+
 2011-11-25  Yury Semikhatsky  <[email protected]>
 
         [Chromium] Web Inspector: get rid of WebDevToolsFrontendClient::sendFrontendLoaded method

Modified: trunk/Tools/Scripts/old-run-webkit-tests (101168 => 101169)


--- trunk/Tools/Scripts/old-run-webkit-tests	2011-11-25 14:17:10 UTC (rev 101168)
+++ trunk/Tools/Scripts/old-run-webkit-tests	2011-11-25 14:19:03 UTC (rev 101169)
@@ -238,6 +238,8 @@
         $platform = "qt-arm";
     } elsif (getQtVersion() eq "4.8") {
         $platform = "qt-4.8";
+    } elsif (getQtVersion() eq "5.0") {
+        $platform = "qt-5.0";
     } elsif (isLinux()) {
         $platform = "qt-linux";
     } elsif (isWindows() || isCygwin()) {
@@ -1216,7 +1218,10 @@
   push(@configurationArgs, '-2') if $useWebKitTestRunner;
   system "Tools/Scripts/run-launcher", @configurationArgs, "file://".$testResults if $launchSafari;
 } elsif (isQt()) {
-  unshift @configurationArgs, qw(-graphicssystem raster -style windows);
+  unshift @configurationArgs, qw(-style windows);
+  if (getQtVersion() lt "5.0") {
+    unshift @configurationArgs, qw(-graphicssystem raster);
+  }
   if (isCygwin()) {
     $testResults = "/" . toWindowsPath($testResults);
     $testResults =~ s/\\/\//g;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to