From 93ca852dbf00e93c07269e8cca389bc1222130d3 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Thu, 21 Jan 2016 16:01:46 +0100
Subject: Basic adaptation to Chromium 49
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Converts types, callbacks and headers to match Chromium 49.

Task-number: QTBUG-51173
Change-Id: I544ef46e187105e250fea1b48b72d2c81a906640
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
---
 src/core/gyp_run.pro | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/core/gyp_run.pro')

diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index c34bc9a47..e83db387b 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -44,11 +44,11 @@ cross_compile {
     # Needed for v8, see chromium/v8/build/toolchain.gypi
     GYP_CONFIG += CXX=\"$$which($$QMAKE_CXX)\"
 }
+else {
+    GYP_CONFIG += sysroot=\"\"
+}
 
 contains(QT_ARCH, "arm") {
-    # Chromium will set a default sysroot on arm unless we give it one.
-    !cross_compile: GYP_CONFIG += sysroot=\"\"
-
     GYP_CONFIG += target_arch=arm
 
     # Extract ARM specific compiler options that we have to pass to gyp,
-- 
cgit v1.2.3