summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2016-12-09 15:11:48 +0100
committerMichal Klocek <michal.klocek@qt.io>2016-12-13 12:27:02 +0000
commita87668b3deec05d52b50df9e6180738219f47373 (patch)
tree57dbc0cca373ba7436e5bbf9f02e4722d4f8d39a
parenta89675a112e609a315ada91bffca3c79391933c2 (diff)
Avoid clobbering the argument scope for v8_use_external_startup_data
Change-Id: I2579755a9306eed1433b4ffe0212eb29aeadeb11 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/build_overrides/v8.gni5
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/build_overrides/v8.gni b/chromium/build_overrides/v8.gni
index af9d9cc6827..ae109f80e63 100644
--- a/chromium/build_overrides/v8.gni
+++ b/chromium/build_overrides/v8.gni
@@ -9,8 +9,9 @@ if (is_android) {
# TODO(sky): nuke this. Temporary while sorting out http://crbug.com/465456.
enable_correct_v8_arch = false
-v8_use_external_startup_data = !is_ios
-
+if (!use_qt) {
+ v8_use_external_startup_data = !is_ios
+}
# Turns on compiler optimizations in V8 in Debug build.
v8_optimized_debug = true