diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 12:15:52 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 12:16:06 +0100 |
| commit | de4f791e30be4e4239b381c11745ffa4d87ddb8b (patch) | |
| tree | 885e3a5d6670828b454cf676b4d42f78e28b1f0e /Tools/Scripts | |
| parent | b022df48697d40cdabdeafb2c29bb14fe489b6fe (diff) | |
| download | qtwebkit-de4f791e30be4e4239b381c11745ffa4d87ddb8b.tar.gz | |
Imported WebKit commit e2c32e2f53e02d388e70b9db88b91d8d9d28fc84 (http://svn.webkit.org/repository/webkit/trunk@133952)
Revert back to an older snapshot that should build on ARM
Diffstat (limited to 'Tools/Scripts')
| -rwxr-xr-x | Tools/Scripts/webkitdirs.pm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm index ea26be405..76770b706 100755 --- a/Tools/Scripts/webkitdirs.pm +++ b/Tools/Scripts/webkitdirs.pm @@ -1873,11 +1873,9 @@ sub retrieveQMakespecVar sub qtMakeCommand($) { my ($qmakebin) = @_; - chomp(my $mkspec= `$qmakebin -query QMAKE_XSPEC`); - chomp(my $mkspecPath = `$qmakebin -query QT_HOST_DATA`); - $mkspecPath .= "/mkspecs/"; - $mkspecPath .= $mkspec; - my $compiler = retrieveQMakespecVar("$mkspecPath/qmake.conf", "QMAKE_CC"); + chomp(my $mkspec = `$qmakebin -query QT_HOST_DATA`); + $mkspec .= "/mkspecs/default"; + my $compiler = retrieveQMakespecVar("$mkspec/qmake.conf", "QMAKE_CC"); #print "default spec: " . $mkspec . "\n"; #print "compiler found: " . $compiler . "\n"; |