From 9e65aaf4e0d0c5b5d927f2fbc5c8aa052bae24b8 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 1 Jul 2016 14:14:41 +0200 Subject: Fix building on OS X 10.9 with 10.10 SDK Previously building on OS X 10.9 was only allowed with a 10.10.3 SDK. But there is no supported version of Xcode on 10.9 that would ship with that SDK, which lead to the fact that there was no way to compile WebEngine with an officialy provided toolchain. This patch lowers the requirement of the SDK to 10.10, at the expense of disabling usage of API that was added in the 10.10.3 SDK release (Force Touch API). The required minimum Xcode version is thus bumped to 6.1, and the documentation is updated accordingly. Task-number: QTBUG-54486 Change-Id: I025caa336ceac5b8ea76ef451eb5e6b78abfe0c9 Reviewed-by: Allan Sandfeld Jensen --- src/3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/3rdparty') diff --git a/src/3rdparty b/src/3rdparty index 77c17ae35..c109a95a0 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 77c17ae35f825cb70e46b880fb0b5ed7be83709c +Subproject commit c109a95a067af783e48f93d1cdeca870cda98878 -- cgit v1.2.3 From e24186f1c08d69473bc450b035b9063d5cc9fefb Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 28 Jul 2016 14:12:40 +0200 Subject: Update Chromium sub-module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pulls in security updates from Chromium 42 and two gyp fixes. Change-Id: I0466d48c85640cae57e28c9621800bb1d8665655 Reviewed-by: Michael Brüning --- src/3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/3rdparty') diff --git a/src/3rdparty b/src/3rdparty index c109a95a0..7f6555e99 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit c109a95a067af783e48f93d1cdeca870cda98878 +Subproject commit 7f6555e9921bfff1886f1e63bb802c252281e882 -- cgit v1.2.3