From de4f791e30be4e4239b381c11745ffa4d87ddb8b Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Fri, 9 Nov 2012 12:15:52 +0100
Subject: Imported WebKit commit e2c32e2f53e02d388e70b9db88b91d8d9d28fc84
 (http://svn.webkit.org/repository/webkit/trunk@133952)

Revert back to an older snapshot that should build on ARM
---
 Tools/Scripts/webkitdirs.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'Tools/Scripts')

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";
-- 
cgit v1.2.1