Unreviewed buildfix.

[Qt][WK2] Build Webkit2 using "-2" option on Qt
https://bugs.webkit.org/show_bug.cgi?id=55074

* Scripts/build-webkit: Ensure that "-2" isn't passed to qmake.
(The isWK2() function removes it from @ARGV, but not from @options.)

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@82756 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 6d2a281..4b903ed 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-04-01  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Unreviewed buildfix.
+
+        [Qt][WK2] Build Webkit2 using "-2" option on Qt
+        https://bugs.webkit.org/show_bug.cgi?id=55074
+
+        * Scripts/build-webkit: Ensure that "-2" isn't passed to qmake.
+        (The isWK2() function removes it from @ARGV, but not from @options.)
+
 2011-04-01  Keith Kyzivat  <keith.kyzivat@nokia.com>
 
         Reviewed by Csaba Osztrogonác.

diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index 844cf0c..1053b4e 100755 (executable)
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -502,11 +502,11 @@ if (isGtk()) {
     # Will fail if WebKitSupportLibrary.zip is not in source root.
     (system("perl Tools/Scripts/update-webkit-support-libs") == 0) or die;
 } elsif (isQt()) {
-    @options = @ARGV;
     push @options, "--install-headers=" . $installHeaders if defined($installHeaders);
     push @options, "--install-libs=" . $installLibs if defined($installLibs);
     push @options, "--makeargs=" . $makeArgs if $makeArgs;
     push @options, "--qmakearg=CONFIG+=webkit2" if isWK2();
+    @options = (@ARGV, @options);
 
     foreach (@features) {
         push @options, "DEFINES+=$_->{define}=${$_->{value}}" if ${$_->{value}} != $_->{default};