Changeset 26593 in webkit


Ignore:
Timestamp:
Oct 14, 2007 6:02:48 AM (16 years ago)
Author:
bdash
Message:

2007-10-14 Holger Hans Peter Freyther <zecke@selfish.org>

Reviewed by Mark.

  • Scripts/webkitdirs.pm: Use qmake binary specified via --qmake on command-line when querying for QMAKE_MKSPECS.
Location:
trunk/WebKitTools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r26592 r26593  
     12007-10-14  Holger Hans Peter Freyther  <zecke@selfish.org>
     2
     3        Reviewed by Mark.
     4
     5        * Scripts/webkitdirs.pm: Use qmake binary specified via --qmake on command-line
     6        when querying for QMAKE_MKSPECS.
     7
    182007-10-14  Andrew Wellington  <proton@wiretapped.net>
    29
  • trunk/WebKitTools/Scripts/webkitdirs.pm

    r26586 r26593  
    609609}
    610610
    611 sub qtMakeCommand()
    612 {
    613     chomp(my $mkspec = `qmake -query QMAKE_MKSPECS`);
     611sub qtMakeCommand($)
     612{
     613    my ($qmakebin) = @_;
     614    chomp(my $mkspec = `$qmakebin -query QMAKE_MKSPECS`);
    614615    $mkspec .= "/default";
    615616
     
    638639
    639640    push @buildArgs, "-r";
    640     my $make = qtMakeCommand();
    641641
    642642    my $qmakebin = "qmake"; # Allow override of the qmake binary from $PATH
     
    650650    }
    651651
     652    my $make = qtMakeCommand($qmakebin);
    652653    my $config = configuration();
    653654    my $prefix = $ENV{"WebKitInstallationPrefix"};
Note: See TracChangeset for help on using the changeset viewer.