From 42828ce4bb53fe8fb6ac37d29c2b1bbb4633d0c5 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 3 Feb 2017 20:48:49 +0100 Subject: Switch mac builds to gn Updates chromium: cd3417b Override xcode min version to 0721 d67d4bb Remove pending messages DCHECK to stop certain tests from crashig [ChangeLog] Switch mac builds to gn Change-Id: I78111bd931f43ceb6e28d67da73f6fb2b2051c9b Reviewed-by: Allan Sandfeld Jensen Reviewed-by: Qt CI Bot --- src/3rdparty | 2 +- tools/qmake/mkspecs/features/configure.prf | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/3rdparty b/src/3rdparty index 1fd9f11a2..cd3417bc8 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 1fd9f11a2dc1ef7cf52c2a631ca0e9b9921bc759 +Subproject commit cd3417bc8b5bae4cdc04a9dd714adadacc03b28d diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 98b11c40a..b0e09aca0 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -36,6 +36,7 @@ defineTest(runConfigure) { isQtMinimum(5, 9) { qtConfig(appstore-compliant): WEBENGINE_CONFIG += use_appstore_compliant_code linux: !cross_compile: use_gold_linker: WEBENGINE_CONFIG += use_gn + macos: WEBENGINE_CONFIG += use_gn } linux { -- cgit v1.2.3