Title: [99276] trunk/Tools
Revision
99276
Author
[email protected]
Date
2011-11-04 06:39:40 -0700 (Fri, 04 Nov 2011)

Log Message

[Qt] Ignore '-2' if passed to build-webkit. WebKit2 is now built by default.

Reviewed by Simon Hausmann.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (99275 => 99276)


--- trunk/Tools/ChangeLog	2011-11-04 13:37:12 UTC (rev 99275)
+++ trunk/Tools/ChangeLog	2011-11-04 13:39:40 UTC (rev 99276)
@@ -1,3 +1,11 @@
+2011-11-04  Tor Arne Vestbø  <[email protected]>
+
+        [Qt] Ignore '-2' if passed to build-webkit. WebKit2 is now built by default.
+
+        Reviewed by Simon Hausmann.
+
+        * Scripts/build-webkit:
+
 2011-11-04  Carlos Garcia Campos  <[email protected]>
 
         [GTK] Use web view title as window title in MiniBrowser

Modified: trunk/Tools/Scripts/build-webkit (99275 => 99276)


--- trunk/Tools/Scripts/build-webkit	2011-11-04 13:37:12 UTC (rev 99275)
+++ trunk/Tools/Scripts/build-webkit	2011-11-04 13:39:40 UTC (rev 99276)
@@ -544,6 +544,11 @@
     push @options, "--install-libs=" . $installLibs if defined($installLibs);
     push @options, "--makeargs=" . $makeArgs if $makeArgs;
     push @options, "--qmakearg=CONFIG+=no_webkit2" if $noWebKit2;
+
+    if (checkForArgumentAndRemoveFromARGV("-2")) {
+        print "Note: WebKit2 is now built by default, you don't need to passs -2. Disable using --no-webkit2\n";
+    }
+
     @options = (@ARGV, @options);
 
     foreach (@features) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to