summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-05-23 13:57:40 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-04 18:50:42 +0200
commitebdca4992f35560c3cea40b87e0fe2360943a427 (patch)
tree0bfee8a3d0d07856064262bda755a68b85cfb7c2 /src/core
parent10fda1bb8b0e9a9d034a81f80a8242a3f46bed17 (diff)
Define mac_sdk_min and mac_deployment_target instead of mac_sdk_path
With Qt 5.3 mac_sdk_path ends up being empty, so make sure to set the proper flags for chromium to pick the right sdk. Also add clang_use_chrome_plugins=0 so we can remove it as well from the Mac-Use-libc-instead-of-stdlibc patch. Change-Id: Ia132f079f905761644ad26c728f7116f538ea62d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/config/mac_osx.pri7
-rw-r--r--src/core/core_module.pro3
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index e4ff78c5a..b24d981b2 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -1,2 +1,5 @@
-GYP_ARGS += "-D qt_os=\"mac\" -D mac_sdk_path=\"$${QMAKE_MAC_SDK_PATH}\""
-
+GYP_CONFIG += \
+ qt_os=\"mac\" \
+ mac_sdk_min=\"10.7\" \
+ mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \
+ clang_use_chrome_plugins=0
diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index 1d5ea6be0..ffea48b47 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -1,9 +1,6 @@
MODULE = webenginecore
TARGET = QtWebEngineCore
-# We depend on libc++ to build chromium so our macosx-version-min has to be 10.7
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
-
QT += qml quick
QT_PRIVATE += qml-private quick-private gui-private core-private