diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Tools/Scripts/build-jsc | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Tools/Scripts/build-jsc')
| -rwxr-xr-x | Tools/Scripts/build-jsc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Tools/Scripts/build-jsc b/Tools/Scripts/build-jsc index c9d4134..bdabd5a 100755 --- a/Tools/Scripts/build-jsc +++ b/Tools/Scripts/build-jsc @@ -69,8 +69,12 @@ if (isAppleMacWebKit()) { $result = buildVisualStudioProject("JavaScriptCore.vcproj/JavaScriptCore.sln"); } elsif (isGtk()) { $result = buildGtkProject("JavaScriptCore"); -} elsif (isQt() or isWx()) { - # Qt builds everything in one-shot. No need to build anything here. +} elsif (isQt()) { + # Remove duplicated --qt options to avoid passing them to qmake + checkForArgumentAndRemoveFromARGV("--qt"); + $result = buildQMakeProject("JavaScriptCore", 0, @ARGV); +} elsif (isWx()) { + # Builds everything in one-shot. No need to build anything here. $result = 0; } else { die "Building not defined for this platform!\n"; |