Changeset 99276 in webkit

Timestamp:

Nov 4, 2011, 6:39:40 AM (15 years ago)

Author:

vestbo@webkit.org

Message:

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

Reviewed by Simon Hausmann.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-04  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        [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  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/build-webkit

@@ -545 +545 @@
     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);