Add --qmakearg=foo to make it possible to configure the build without editing

the .pro files each time.

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 529401e87922b5fe3bdd5b3755217b251640ea4f..61c23efeda7a221ae7cbeacd6af47008e201fec7 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-06  George Staikos  <staikos@kde.org>
+
+        Reviewed by Anders.
+
+        Allow passing of additional arguments to qmake with --qmakearg=
+
+        * Scripts/webkitdirs.pm:
+
 2007-07-05  George Staikos  <staikos@kde.org>
 
         Reviewed by Maciej.

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 39e69e2b792e516130c62b7dab729b6f4ebf3944..0c072a443be8fc6d43e6558e8d8f1c3635709a3f 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -522,11 +522,15 @@ sub buildQMakeProject($$)
 {
     my ($project, $colorize) = @_;
 
+    my @buildArgs = ("-r");
+
     my $qmakebin = "qmake"; # Allow override of the qmake binary from $PATH
     for my $i (0 .. $#ARGV) {
         my $opt = $ARGV[$i];
         if ($opt =~ /^--qmake=(.*)/i ) {
             $qmakebin = $1;
+        } elsif ($opt =~ /^--qmakearg=(.*)/i ) {
+            push @buildArgs, $1;
         }
     }
 
@@ -537,7 +541,6 @@ sub buildQMakeProject($$)
     my $config = configuration();
     my $prefix = $ENV{"WebKitInstallationPrefix"};
 
-    my @buildArgs = ("-r");
     push @buildArgs, "OUTPUT_DIR=" . baseProductDir() . "/$config";
     push @buildArgs, "CONFIG+=qt-port";
     push @buildArgs, sourceDir() . "/WebKit.pro";